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

Change-Id: I94f2cc39d47e38a13b0d9b390f9c064b919dfe00