Merge commit '4cc22e5ebf7c69e06a6cbf893a97d2ade46c0d54' * commit '4cc22e5ebf7c69e06a6cbf893a97d2ade46c0d54': ADT: Move more packages into internal
Merge commit '4cc22e5ebf7c69e06a6cbf893a97d2ade46c0d54' * commit '4cc22e5ebf7c69e06a6cbf893a97d2ade46c0d54': ADT: Move more packages into internal