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

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