E127 continuation line over-indented for visual indent Also fixes E127 introduces by other reviews after other E127 fixes were merged. Closes-Bug: #1375931 Change-Id: I0a09f1c2f74c707fc8a347f0ea5975bf2679976e