[PEP8] changes

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