This patch is upstreamed by the commit-id:
https://github.com/tianocore/edk2-test/commit/b68e40293485ce3c6bf50294900d068bbaeba213