The patch is upstreamed through the commit: https://github.com/tianocore/edk2-test/commit/92a0343c1553342c53fae9d9d646b763add232c0