DO NOT MERGE Update 24.txt to include type variables. am: c74583f7aa
am: 714a1c527f  -s ours

Change-Id: I655c680aeb6df0f795306b0e7833f017ebc1a5b0