Merge "Fix class comment on ListPlugins"