Split from part 5 because the diff is too large for Phabricator, even when using `--less-context`. Differential Revision: https://phabricator.services.mozilla.com/D227205