[PEP8] changes

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