x64-upstream: Rebase to 270349