[PEP8] changes

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