Merge "Fix statsd dropping metrics data." into pi-dev