Merge "Make TokenBucket available to the network stack" am: a6a681768c am: 0d25ca0ffd

Change-Id: I14229aaeda5ffc27ef1db944e2be692184a6c366