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

Change-Id: Ia3fe0f339f2a79ac02260c58de2e342ac55b82df