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

Upstreamed by the commit id: https://github.com/tianocore/edk2-test/commit/4b5dde3ed1e3300d61b95a2cc7b4a63594fc586e