Clean-up pep8 E123-E126 warnings

Change-Id: Ia65f138f13ead6cf364298ef8c080f41659b9e5e