Pep8 cleanups; mostly whitespace.

Change-Id: I00d973e0b78b96626ccc0286f1f022dd53111a24
Merge "Pep8 cleanups; mostly whitespace." into production