Clean-up pep8 E128 warnings

Change-Id: I07617dcb02ae18b5318f9bb4c06e2b10fa38646e
Merge "Clean-up pep8 E128 warnings"