DO NOT MERGE TokenBucket for rate-limiting and throttling
am: f6fdb4a552

Change-Id: I82e17c2ed074ae37d469adb1f469b6ff1d6365d2