Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am: 484fb951e0
am: 722550cc3c  -s ours

Change-Id: Ia7ed4ded824000ecf111f4ec2886a50dea67fa76