am c0065d0e: Merge "82393: Fix template instantiation in ADT" into studio-1.0-dev automerge: 2d9dc8d0 automerge: 87843304 automerge: f015e9d4 * commit 'c0065d0e': 82393: Fix template instantiation in ADT