Merge "DO NOT MERGE Update 24.txt to include type variables."
am: 0b7d448e5f  -s ours

Change-Id: I463d7bc5d9bd13802a9e6cc133b34e446a37df37