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

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