DO NOT MERGE Update 25.txt to include type variables.

Bug: 24265043
Change-Id: Iafa024e9c2cfe4ed49da3c15377194ac30567398
2 files changed