The patch is upstreamed through commit: https://github.com/tianocore/edk2-test/commit/39f27f233aeab16f71fc8f5ed6b287eb9f884ec6