Fixing ConcurrentModificationException (issue 6619380)

Change-Id: I49d293a79a463d129e829f823d6b213f3d5ffcf4
3 files changed