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

Change-Id: If4957d57dd68bbbd459245c35ca8d049504e12bd