Merge "[SettingsProvider] perf test for null settings" into udc-dev