Merge "Fix atest statsd_test" into rvc-dev