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

Change-Id: I21caba3c521f42397e3be3ba8a68d9aed98ddec9