Fix merge from internal#64096

wtgodbe merged 2 commits intorelease/2.3dotnet/aspnetcore:release/2.3from

wtgodbe/FixMergesdotnet/aspnetcore:wtgodbe/FixMergesCopy head branch name to clipboard