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

Change-Id: I55f4514fd279d207d71f8452b0446c06b27ef709