am 3d50932a: Fixing ConcurrentModificationException (issue 6619380)

* commit '3d50932a93dd367537db3548bde29d1380b371c0':
  Fixing ConcurrentModificationException (issue 6619380)