Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am: 484fb951e0  -s ours am: 5375d9360f
am: 3f3237f4b1

Change-Id: Ica062edbc69050c8cfcf976aed06911f3e62be4e