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

* commit 'f63c48b71751a351f7301d1570192fca7e5dd711':