Merge change 25561 into eclair

* changes:
  Add Gservices settings required for carrier billing.