remove pep8 E122 exemption and correct style

This change removes the E122 exemption for pep8. E122 is "continuation line missing indentation or outdented"

Change-Id: I4bd1e6c787648a3dfa69b514efeeff05996aabc1
Partial-Bug: 1329017
Merge "remove pep8 E122 exemption and correct style"