Merge changes Iea048eaa,I5c246571 into nyc-mr1-dev
am: 72d1772eca

Change-Id: Ia541dde020c6e2ad8674bb7759aa5975111616c8