Merge change Ia94518e3 into eclair

* changes:
  ADT test fixes.