Merge "Track generics in API definition."