pep8 changes

Change-Id: Id82074241828db3a96e25659ea45e368de7edff8
Merge "pep8 changes"