Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115