am 1b9a6057: am 44508515: Merge "Tidy up long lines"

# By Duane Sand
# Via Android Git Automerger (1) and others
* commit '1b9a60574028fd1dd77d6c07efb369ecaaf91218':
  Tidy up long lines