Update merging during broken `master` process

This issue is tracking progress on !77343 (merged).

Post-merge checklist:

• Add a note to the Engineering Week in Review about the change.
• Update our code review process and links to the new process.