Fix Pep8 1.4.6 warnings

Pep8 1.4.6 fixes some missed occassions of the indentation
checks.

Change-Id: Ie87005a9b204db70d4b22bc28425758b282b1eb0
Merge "Fix Pep8 1.4.6 warnings"