am 1d40d9ea: am 7b153a1d: Merge "Fix potential dex index overflow in dx" into lmp-mr1-dev

* commit '1d40d9ea62b8c37cf904108ae886bfba5dac0d84':
  Fix potential dex index overflow in dx