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

Change-Id: I15ae4a6e3283be6ff9a566186210c0f50b504bfa