[PEP8] changes

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