[PEP8] changes

Change-Id: I31d6c0b29bc099cd64254a0c31f5ea25929ac2b3
[PEP8] changes

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