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

Change-Id: I67e23c3ce47da175af2a15c8f755f2ff90c84320