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

Change-Id: I0b5c2b3431279b9cc1d3c1c78cdad4f926f4492c