Merge "Add tests for SettingsProvider.parseProviderList"