Merge "Remove hyphen from rand_name calls in baremetal tests"