Merge "DO NOT MERGE Track generics in support API definition. am: e4ccc3b5cc  -s ours" into nyc-mr1-dev-plus-aosp