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

Change-Id: I93aec90d3688d7db65056130d17085e9f2e798a5