[PEP8] changes

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