Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am: 484fb951e0

Change-Id: Ice2c1b83135368f11884f4d8b2cfab138715e69a