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

Change-Id: Ie62acf8eff6ee5213d7a6319e98f2df4fb4b4030