DO NOT MERGE Track generics in API definition.
am: b4fcc6136e  -s ours

Change-Id: Iada343936c04f2a7f3875f86c1f8c48c5a62be2b