DO NOT MERGE Track generics in API definition.

Bug: 24265043
Change-Id: I2f51d5b914ef4aa66a973db4765da117385e3bfb
3 files changed