DO NOT MERGE Update 24.txt to include type variables.
am: 98417da99b  -s ours

Change-Id: If4a35a3c6b7ff85f099a81add8fec309849e65eb