Merge "[SettingsProvider] fix connectivity test"