Merge "Fix pep8 violations in statistics_manager.py"