DO NOT MERGE Update 24.txt to include type variables.

Bug: 24265043
Change-Id: Ie15050ead49885c8e9ca62e63309f1b7f23c3e73
2 files changed