This will reduce the number of odd line breaks.

Bug: 156858180
Test: none (need to fix the linter to accept this for non-code)
Tag: #gd-refactor
Change-Id: Ibfd8282a7f41faf29665bba25c2c375420b693fa

* Based on Google style and ensure 4 spaces are used for indentation
* http://google.github.io/styleguide/pyguide.html

Bug: 146016811
Test: upload CLs
Change-Id: I27b9232d59e9e9bd59ca1414ef6f9db85c41a808