Merge change I20d77880 into eclair-mr2

* changes:
  Make Gservices setting constants public.