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

Change-Id: I177811b00d0999ab713ec7d3dff020794728c651