Merge "Fix potential dex index overflow in dx" into lmp-mr1-dev