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

Change-Id: Ifcd3c9562bdec26406e59f6aef5c28d308204909