merge in nyc-mr1-release history after reset to nyc-mr1-dev
am: 96c347a9b9

Change-Id: I9a44b38e4aac14d6c41481ef58637bc873a8f85e