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

* commit '6cf79920bc84a08a1fcc1177feb7e80b0d3a48f6':