merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
am: 6727a1e718

Change-Id: I257cedf0b05301148604e4bbfe24b95bd5c5d479