am f5af7ce2: Make ADT use new sdklib API

Merge commit 'f5af7ce21399f9a56167cadaa8196c0b15cfadce'

* commit 'f5af7ce21399f9a56167cadaa8196c0b15cfadce':
  Make ADT use new sdklib API