[PEP8] changes

Change-Id: I06c5caef1dbde999c10c59605b5f5af4cf06fe83
[PEP8] changes

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