pep8 fixes

Change-Id: Ibfd9a513ee265f9fec8dccfe24e967c051fed7e4
pep8 fixes

Change-Id: Idcf98da719b78205c46f2b34f846d6eb22a840d1
pep8 fixes

Change-Id: I21394ea296d46669ceb73f8a9585068345a7b369
pep8 fixes

Change-Id: I20a9ee539e8bd8c1c8eb02fbd902388ede8c65f5
Merge changes I20a9ee53,I21394ea2,Idcf98da7,Ibfd9a513

* changes:
  pep8 fixes
  pep8 fixes
  pep8 fixes
  pep8 fixes