Reviewed-by: G Edhaya Chandran<edhaya.chandran@arm.com>
Upstreamed by : https://github.com/tianocore/edk2-test/commit/92efde18495c2c77ceac1a0cd0d34c32b8e13431