Fixing potential ConcurrentModificationException
am: 5f06401807

Change-Id: Ia8fc09ac55fdb1e3ea9fa4828f7a4d30a93e9e16