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