Simplified PluginUtil

Change-Id: I0916fbae3661bd3576b771482dcb7de95820f828
1 file changed