Add critical sections to avoid ConcurrentModificationException

Flag: NONE simple fix
Fixes: 340111723
Test: passes presubmits
Change-Id: Ic49645a28f7666fa4f3a4d3c967bb9246c6ccfea
1 file changed