am 8e535cec: am dfafaffe: Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev

* commit '8e535cec2e172fc08e2d9c98bb3fb1c66e5552c7':
  Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put