[PEP8] changes

Change-Id: I0bffe2ae3d09dfa7fa9dad014bae5bace3bce00b
[PEP8] changes

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