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

Change-Id: I7008d4e24963640042e9acc3c6307faf9d15efea