[PEP8] changes

Change-Id: Iddfd37775adcae1799b8c6e81b817e31f5b14686
[PEP8] changes

Change-Id: I99b80a56f935132a3133628ba9dbe43d134127e8
Merge changes I99b80a56,Iddfd3777

* changes:
  [PEP8] changes
  [PEP8] changes