am 2be622ac: am 3d50932a: Fixing ConcurrentModificationException (issue 6619380)

* commit '2be622ac5f0320aba1c93fc7987aecfc65dce7f8':
  Fixing ConcurrentModificationException (issue 6619380)