am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev

* commit 'd65ab587052934c42769b2d4cf8ec5fa70ef13f8':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...