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

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