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

Change-Id: I9c0eb15c3a722356d638cd2fd7d328b01f46db8a