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

Change-Id: Ia68bc020f5eb4a97f0c66bd944f27dc0156d4a6d