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

Upstreamed by commit-id : https://github.com/tianocore/edk2-test/commit/00257df4e7a6b80548d60731448e18ec1feb4476