Merge commit 'ea986e301f3f67c3d3446961b5f316c7c4f3112c' * commit 'ea986e301f3f67c3d3446961b5f316c7c4f3112c': Remove the GDD Gservices setting.