The solution is upstreamed through commit-id: https://github.com/tianocore/edk2-test/commit/733a11dceaa043e9e5f95e9e224442f134d0975f