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

Build is verified. Upstreamed by commit-id : https://github.com/tianocore/edk2-test/commit/a7c2b532431b96abea7a3f81b6ed46fc10469c11