am 117f0c15: am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev automerge: 9bb16f5

* commit '117f0c15f7d534afeed20d8e14be8a83f8062f72':
  Ensure arraylist index is montonically decreasing