DO NOT MERGE Track generics in support API definition am: 77cc0d7398
am: 64fcbf9222

Change-Id: I80bdefee24ee01655f9186e5785c4c68fe902705