Merge "Extend & refactor Statsd TestDrive tool." into rvc-dev