Merge change 25794 into eclair

* changes:
  Remove the GDD Gservices setting.