[PEP8] pep8 changes

Change-Id: If3c462e84fee96f35e613ee08ae6499dc7d111a0
[PEP8] pep8 changes

Change-Id: I9516513348b78e6908f703d797743fb666664b44
Merge changes I95165133,If3c462e8

* changes:
  [PEP8] pep8 changes
  [PEP8] pep8 changes