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

Change-Id: I2b04609a70dac1e4653fd2bbd727d457f1ab990f