Merge "statsd local tool"