Merge "DO NOT MERGE Track generics in support API definition." am: d732fd4f36  -s ours
am: 11aba16536  -s ours

Change-Id: I60d7cf143a8403876f4c4f878a2610df2a771aaf