Fixing ConcurrentModificationException

Bug: 120664974
Test: Manual
Change-Id: I67e88c6980fbabb9afb9f4946baf731852f19b19
1 file changed