Fixing ConcurrentModificationException.

Implementing review feedback.

Bug: 17572658
Change-Id: I3a060d21669a58188a24c5d6ec5fefcbca45a976
1 file changed