Port dotnet/coreclr#5504 to corert (#1379)
Port dotnet/coreclr#5504 to corert (#1379)

Port dotnet/coreclr#5504 to corert
krytarowski/corert,botaberg/corert,tijoytom/corert,kyulee1/corert,sandreenko/corert,yizhang82/corert,shrah/corert,shrah/corert,krytarowski/corert,sandreenko/corert,tijoytom/corert,kyulee1/corert,krytarowski/corert,shrah/corert,krytarowski/corert,gregkalapos/corert,gregkalapos/corert,botaberg/corert,kyulee1/corert,sandreenko/corert,yizhang82/corert,gregkalapos/corert,gregkalapos/corert,shrah/corert,tijoytom/corert,yizhang82/corert,tijoytom/corert,botaberg/corert,kyulee1/corert,botaberg/corert,sandreenko/corert,yizhang82/corert