Fix Pep8 indentation issues only found with Pep8 1.4.6+

Change-Id: Iea9821b95278f1853e5fe98b21c61cb3e9e42da8
Merge "Fix Pep8 indentation issues only found with Pep8 1.4.6+"