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

Change-Id: I77fac787ec1be398dc6597131894003db73c9cd4