[PEP8] pep8 changes

Change-Id: I22c87805e30f8e634c786a25e28f7b7ac145ffca
Merge "[PEP8] pep8 changes"