Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-release