DO NOT MERGE Update 24.txt to include type variables.
am: 7d813594bb

Change-Id: I5a9c2917640effc2d28b855769e98cc3626980bd