Merge change 25187 into eclair

* changes:
  fixing documentation for PluginStub