Merge "Fix ConcurrentModificationException" into rvc-dev am: 724e880e am: f2453291 am: 652aeadb Change-Id: Ic63ed4d68ecea4365b81692165d4de920c044f0c