[PEP8] changes

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