Merge change 1159 into donut

* changes:
  CoreTests: Fix LocationManagerProximityTest.