[PEP8] pep8 changes

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