[PEP8] changes

Change-Id: I5e45c6f948748dde321cb26725fecc68dd0a875f
[PEP8] changes

Change-Id: I7a709cc64401751e221d83ed84faedc142a5082c
Merge "[PEP8] changes"
Merge "[PEP8] changes"