Merge "Update DefaultPreferencesFactory to use NamespaceInfo"