The solution is upstreamed by commit-id: https://github.com/tianocore/edk2-test/commit/814b2af535d977b3967d65de77e42ab18a4f4db4