Fix line continuations (flake8 E125, E126)

- E125: continuation line does not distinguish itself from next logical
  line
- E126: continuation line over-indented for hanging indent

Change-Id: I626a6d5d57db927e8b239f90569b5601c772f28b
Merge "Fix line continuations (flake8 E125, E126)"