Fix possible ConcurrentModificationException

Bug: 18895233
Change-Id: Iece6bd467c74082e2ea48df2ff9bb51767b75c17
2 files changed