Merge "Fix statsd crash due to bad bucket index" into pi-dev