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

Upstreamed by Commit ID:
https://github.com/tianocore/edk2-test/commit/9655dc86702804e11d5c233596a2aaf52bbe761e