Merge "Statsd: Remove storage of bucketNum" into pi-dev am: aaadf6663f
am: 7d25dc57d8

Change-Id: Ic4689c1e6c4f36046190674f0b03bc94713ddeaf