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

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