Merge "Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am: 6791bee7" into oc-dr1-dev