Pep8 cleanup

Change-Id: I51837d8a00bfdb9a77add0c1ac810e93856a40ac
Merge "Pep8 cleanup" into production