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

Upstreamed by the commit-id: https://github.com/tianocore/edk2-test/commit/7be3e2d198adcbb6c3f104111b5be2660e8bea88