[PEP8] changes

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