am 16519474: am 138e0db4: Fix off-by-one issue when removing from Iterator

* commit '16519474a607aa61d01785101e9d4e1e1d97a88c':
  Fix off-by-one issue when removing from Iterator