am 85e42829: am ea433f65: Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev

* commit '85e428291d2a569d5d9af1d749b69e9a646064fc':
  Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put