Merge change If5b2f9df into eclair

* changes:
  Fix ADT test data references.