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

Change-Id: Iea69c7ea424e334a5deeea6d7c4b1a7ba31bac05