pep8 changes

Change-Id: I3022347a0c15168af7e3d862593c9ed4f63826bc
Merge "pep8 changes"