Merge change 1681 into donut

* changes:
  Remove duplicate initialization in AdtPlugin.