Reviewed-by: G Edhaya Chandran <edhaya.chandran@arm.com>

Upstreamed by Commit ID:
https://github.com/tianocore/edk2-test/commit/2eaa6232f3258ec802e244018818c9eca0b27711