Merge "Rename PluginConfigProvider to PluginConfigFactory."