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

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