Merge "Statsd test mapping" into rvc-dev