Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am: 484fb951e0 -s ours
am: 5375d9360f
Change-Id: Ib2dd5a0264733ab829c2976eef29a68056aacc2c
This commit is contained in: