[PEP8] changes

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