Merge "remove Settings.Gservices"