[PEP8] changes

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