Reviewed-by: G Edhaya Chandran &lt;edhaya.chandran@arm.com&gt;<br />The solution is upstreamed by the commit:&nbsp;https://github.com/tianocore/edk2-test/commit/18a8ca0dda79a9348157d77083ba1e1b9b18081b