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

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