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

Change-Id: Ic00fae7701ddb74914e7154fb878ffe4a48a9b55