merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: 6727a1e718 am: 9ac16f1f48
am: 8b3b60cbf9  -s ours

Change-Id: I9f3531f12a1ad1503650a93175bc02b9a9129db7