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

Change-Id: If6f40489b60688ee66f2fca1df2698e3c3ca0b5b