Upstreamed through commit : https://github.com/tianocore/edk2-test/commit/4a25c3b3c79f63bd9f98b4fffcb21b5c66dd14bb