x64-upstream: Rebase to r277286 to roll r277250