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

Change-Id: Ie0e82a9f99c172cf85803ca9885bc265aa79486c