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

Change-Id: I2bd4481438c382c718d51c65fe3941e88c63b2c7