am ebe66dfe: am 9e4715e6: Fix ADT to use the new sdklib API

Merge commit 'ebe66dfea999e2e7bfe53f022938fbc273428b3d'

* commit 'ebe66dfea999e2e7bfe53f022938fbc273428b3d':
  Fix ADT to use the new sdklib API