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

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