DO NOT MERGE Track generics in support API definition
am: 77cc0d7398

Change-Id: I39cbbd6eda2494d8ebd0bbabbfc5a6e5f34b6bb7