Merge "DO NOT MERGE Track generics in support API definition" into nyc-mr1-dev
am: 550c62256c

Change-Id: I9439b0e88e530b2a767698eade623915d0aea35a