Merge commit '20d4ecf2d785bb0120222ab4ab249abc1165314c' * commit '20d4ecf2d785bb0120222ab4ab249abc1165314c': ADT: remove an obsolete import from the manifest.
Merge commit '20d4ecf2d785bb0120222ab4ab249abc1165314c' * commit '20d4ecf2d785bb0120222ab4ab249abc1165314c': ADT: remove an obsolete import from the manifest.