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

Change-Id: I859a0de118d4ff4b240401afa0667657fe2ff71c