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

* commit 'da5d3b7f6e4c411cfc216547da49de45e809237d':
  Fix ArrayIndexOutOfBoundsException, (issue 11038649)