am ddf080cf: am f10b0f92: am 3e232794: am 76bf5553: Merge "A bit of code cleanup (issue 11026590)" into jb-ub-now-jetsonic

* commit 'ddf080cf1e53dec3a149efed3ca22cc999175800':
  A bit of code cleanup (issue 11026590)