Merge "Update ADT to match DeviceManager API change." into idea133
 Auto-merge: 10ec51f

* commit '10ec51f2a6a5cccad02f5251221c965a56a4f364':
  Update ADT to match DeviceManager API change.