Fix E12x warnings found by Pep8 1.4.6

These are missed due to bugs in 1.4.5.

Closes-Bug: #1267994
Change-Id: Ic7b37abf757a9b7b0c8306c941949dee93b83e08
Merge "Fix E12x warnings found by Pep8 1.4.6"
Test commit