Merge "(Part 1) Use new socket schema with statsd tests" into rvc-dev