Merge changes from topic 'nyc-mr1-generics-api' into nyc-mr1-dev am: 8b9d0f8a5d am: bbb9f9c7bd
am: ca669642e4

Change-Id: Ic90855102242331f8aea04981ab04dc4b3266347