[PEP8] changes

Change-Id: Id35a3fe33c33d12e11d1118221beab953f261dbd
[PEP8] changes

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