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