Patch is upstreamed through commit: https://github.com/tianocore/edk2-test/commit/7c60a6d4c73a2a4a5e1f352534e103f0f1a418bd