am 12ac1e6f: Fix ConcurrentModificationException

* commit '12ac1e6f15ae9e4d4e453e7f28467fdd561939a3':
  Fix ConcurrentModificationException