Pep8 cleanup stage one:  tab purge!

Change-Id: Icb8bcf4ce0a1e32ee2918f0cbc752f0350483f08
Merge "Pep8 cleanup stage one:  tab purge!" into production