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

Change-Id: Ifcff1f271119ae23ef30b547ca77167dd76d1292