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

Change-Id: I6ac6594e20277881066441f9796fa7ac03b4b9ac