pep8 style fixes

Change-Id: I1c8d2baf00fecd2e4d3c38920fff5b654ee34aed
Merge "pep8 style fixes"