Merge change 4797 into donut

* changes:
  Use new location of USE_LOCATION_FOR_SERVICES setting (Secure).