Merge changes from topic 'api-generics'

* changes:
  Update 26.txt to include type variables.
  Update 25.txt to include type variables.
  Update 24.txt to include type variables.