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

* commit '40d6264a8e1a29b0f11a03fff39db1dc7f967088':
  Fix ArrayIndexOutOfBoundsException, (issue 11038649)