Merge changes from topic 'nyc-mr1-generics-api' into nyc-mr1-dev

* changes:
  DO NOT MERGE Update 25.txt to include type variables.
  DO NOT MERGE Update 24.txt to include type variables.