Merge change 26490 into eclair

* changes:
  Fix possible NPE in DDMS plugin init.