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

(cherry picked from commit 3ff811fe18c32f1c1b5033ef9f09d07f46b3156c)

Bug: 24265043
Change-Id: I0764bf419cf7239b31336b2bcef4035c1d5de760
2 files changed