merge in nyc-mr1-release history after reset to nyc-mr1-dev
am: 73eee30ffe

Change-Id: I32635801fa4338f313feef7655c7636253d708d3