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