fixed several pep8 issues

  * E111 indentation is not a multiple of four
  * E113 unexpected indentation
  * E122 continuation line missing indentation or outdented
  * E128 continuation line under-indented for visual indent

Change-Id: I91babf85fd190849e3ee3272c7890d670c279e02
Merge "fixed several pep8 issues"