Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev