Merge "statsd unit test and benchmark refactor" into rvc-dev