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

* commit '7b153a1d75a3f51d38e5742df142f58a82f14fe3':
  Fix potential dex index overflow in dx