Merge change 1158 into donut

* changes:
  location: Fix mock provider support