merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 96c347a9b9 am: 627cc3afb3 am: c51d68746c
am: 539556ac79

Change-Id: I01fb922ced6599fa4a56d29950e153b5f1b52821