Use adt_def
during type collection.
#103759
Merged
adt_def
during type collection.
#103759