Land the two parent diffs, then rebase this one on top of them.
Migrated from D645 (view on Phabricator)