[PEP8] changes

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