Merge "Vulnerability fixes in ServicePluginFactory"