Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev
am: 6f1b29ef67

Change-Id: Id8dd0eb4d799fa059e811c48027048ad27650559