Merge "Fix SettingsProviderTest."