Clean-up pep8 E127 warnings

Change-Id: I144bb6e06ce318bbd42f2ea0a2f5875499c18e26
Merge "Clean-up pep8 E127 warnings"