Merge commit '5048d7e4b3467eaafa4d06ca1978ad86c3a1f3d0' * commit '5048d7e4b3467eaafa4d06ca1978ad86c3a1f3d0': Update ADT feature dependency.
Merge commit '5048d7e4b3467eaafa4d06ca1978ad86c3a1f3d0' * commit '5048d7e4b3467eaafa4d06ca1978ad86c3a1f3d0': Update ADT feature dependency.