Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which...