am 980a0ae5: am 2c7aa0cd: am dad01235: am da5d3b7f: am 40d6264a: Merge "Fix ArrayIndexOutOfBoundsException, (issue 11038649)" into jb-ub-now-indigo-rose

* commit '980a0ae566981c610fecad4e45defab925289151':