Merge "DO NOT MERGE Update 24.txt to include type variables."