DO NOT MERGE Track generics in API definition.
am: 62b7f8bf7c

Change-Id: I02d32857ebdc9316d19a35bc253555e73b54c9bb