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

Change-Id: Ifad48a57d045c8b8548d8ca9cc659a16a9a2d1bf