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

Change-Id: I0d20aee1275a5cc0c1b702ce03a316d103c1d08c