x64-upstream: Rebase to r278633