Port https://github.com/dotnet/coreclr/pull/13148 to master (#14999)
Port https://github.com/dotnet/coreclr/pull/13148 to master (#14999)


cshung/coreclr,mmitche/coreclr,yizhang82/coreclr,mmitche/coreclr,cshung/coreclr,ruben-ayrapetyan/coreclr,JosephTremoulet/coreclr,poizan42/coreclr,mmitche/coreclr,wtgodbe/coreclr,krk/coreclr,yizhang82/coreclr,poizan42/coreclr,yizhang82/coreclr,wtgodbe/coreclr,ruben-ayrapetyan/coreclr,JosephTremoulet/coreclr,JosephTremoulet/coreclr,poizan42/coreclr,poizan42/coreclr,krk/coreclr,cshung/coreclr,JosephTremoulet/coreclr,poizan42/coreclr,ruben-ayrapetyan/coreclr,mmitche/coreclr,krk/coreclr,poizan42/coreclr,cshung/coreclr,ruben-ayrapetyan/coreclr,wtgodbe/coreclr,ruben-ayrapetyan/coreclr,wtgodbe/coreclr,krk/coreclr,wtgodbe/coreclr,krk/coreclr,yizhang82/coreclr,ruben-ayrapetyan/coreclr,yizhang82/coreclr,cshung/coreclr,mmitche/coreclr,yizhang82/coreclr,cshung/coreclr,wtgodbe/coreclr,JosephTremoulet/coreclr,krk/coreclr,mmitche/coreclr,JosephTremoulet/coreclr