DO NOT MERGE Update 24.txt to include type variables. am: 7d813594bb
am: 4b611d7eac

Change-Id: Ia73d46294c98990c7e27c9f9fe2a20588fc5a2fb