Merge "DO NOT MERGE Track generics in support API definition" into nyc-mr1-dev am: 550c62256c
am: 8e6a8ca393

Change-Id: Id3fef985436d7383a251cfe5fe127c7f103657f9