Solution is upstreamed through commit: https://github.com/tianocore/edk2-test/commit/d919c4a5d9fe2681de4d11a0bbfb07373fe6f9c7