[PEP8] changes

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