Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev