Merge "Fix a SettingsProvider test : 2377540"