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

* commit '9bb16f55e80afaeb6700af9fc97a58a8b3309412':
  Ensure arraylist index is montonically decreasing