DO NOT MERGE Track generics in support API definition. am: 32ad905542  -s ours am: 64ef60f1c7
am: d4148f84a3  -s ours

Change-Id: Ide24faddbdbb889e1974ae2a12eb356a0fd7733e