Merge "Remove hyphen from rand_name calls in thirdparty tests"