PEP8 fixes

Change-Id: Ib1ebe393e967e7a9cef929e75892f96474f5c2fb
Partial-Bug: #1575759
6 files changed