DO NOT MERGE Track generics in API definition.

Bug: 24265043
Change-Id: I29a1f1c2011f967360506148e4e8cbdd605f1333
3 files changed