Merge "Fix crash from concurrent modification" into oc-dev am: e3f2f29cde
am: 529b8e214b

Change-Id: I99d647097dd51524247aabcc7691792cb53ecafd