Merge change 4796 into donut

* changes:
  Move USE_LOCATION_FOR_SERVICES to Secure.