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

Change-Id: I6c287fa3e59545e66d7c811adbbc4b1b08e6fe36