Fixup indentation errors found by Pep8 1.4.6+

Closes-Bug: #1267994

Change-Id: I2662c863e21baa6a290311ec8eb12a01193eed94
Merge "Fixup indentation errors found by Pep8 1.4.6+"