Merge "Statsd: Remove storage of bucketNum" into pi-dev