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

Change-Id: I8fa6d484066f6b7286b08983b5c6edce7caac9f9