Merge "Merge "Fixed a concurrent modification crash" into oc-dev am: 33bd2c6333" into oc-dev-plus-aosp
am: 147e154ad5

Change-Id: Ic5f98c3c01af7523fabfe4a41a86f92a8a717fc7