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

Change-Id: Ia992d36b52dfa5a539192f8b2696b1bad75cdddd