Merge change 2182 into donut

* changes:
  location: Replace ILocationCollector interface with new ILocationProvider method