Reviewed-by: G Edhaya Chandran Upstreamed by Commit-id: https://github.com/tianocore/edk2-test/commit/f96b1f9b8d569a9527c7204f86b4155e1fd8bc2b