Merge "Revert (with changes) "Revert "Add multiple services support in SecureSettingsServiceNameResolver, to"""