am 6f9ed107: Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-dev automerge: 1d5ab02a automerge: 72e0b005 automerge: 68e0d949 * commit '6f9ed107': Revert "82393: Fix template instantiation in ADT"