am d00a9bcf: Merge change I3e6a5048 into eclair

Merge commit 'd00a9bcffed8fa7cdd4bac8b58c6abe7d6e93adf' into eclair-mr2

* commit 'd00a9bcffed8fa7cdd4bac8b58c6abe7d6e93adf':
  Fix ADT tests failures: