DO NOT MERGE Update 25.txt to include type variables.
am: 8ea7d8e24c

Change-Id: Id0e7c2d6604797090645aa3a7f409b0f46b1ef61