Upstreamed by Commit-ID:
https://github.com/tianocore/edk2-test/commit/23421e1d8393582545b01d3deee4d26e3a9f9a05