am 931b89b5: Merge "Fix potential dex index overflow in dx"

* commit '931b89b5d6e2c0243bc03547df1c9a0e18f1f6f8':
  Fix potential dex index overflow in dx