Merge remote-tracking branch 'goog/nyc-mr1-dev-plus-aosp' into HEAD