DO NOT MERGE Update 25.txt to include type variables. am: 8ea7d8e24c am: 3f98c3be64
am: 7a0a578bb6  -s ours

Change-Id: I05ceadf92538e4ac62664e65bf70f4ab126320ff