Merge commit '2c83a9f10cc8ac33e1caf411da571e2aa85c0909' * commit '2c83a9f10cc8ac33e1caf411da571e2aa85c0909': Update ADT to use the refactored sdklib from previous patch.
Merge commit '2c83a9f10cc8ac33e1caf411da571e2aa85c0909' * commit '2c83a9f10cc8ac33e1caf411da571e2aa85c0909': Update ADT to use the refactored sdklib from previous patch.