Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am: 6791bee7 am: 9980bade am: ce3775bb Change-Id: I763b909dd371450f50ebe03bb20655bad23793da