[PEP8] changes

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