Merge "Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev am: 1761985e42 am: d9f25b7c24"