Merge change 3899 into donut

* changes:
  GpsLocationProvider: Add hooks for GPS location injection.