Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 96c347a9b9 am: 627cc3afb3 am: c51d68746c am: 93f8319bc7" into nyc-mr2-dev-plus-aosp