DO NOT MERGE Update 24.txt to include type variables. am: 7d813594bb am: 4b611d7eac
am: 0f68e28601  -s ours

Change-Id: I77ca063c7a80add82e8a91e5032f4a40cca5eb5b