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

Change-Id: Ie153b3a5a5d35ec4b79ca15ed5da8b1de41d4c24