Merge commit '208364d304d332241301870bd75b69e181f72446' * commit '208364d304d332241301870bd75b69e181f72446': Make Gservices setting constants public.
Merge commit '208364d304d332241301870bd75b69e181f72446' * commit '208364d304d332241301870bd75b69e181f72446': Make Gservices setting constants public.