DO NOT MERGE: TokenBucket for rate-limiting and throttling am: 05ad47add8  -s ours
am: c50e9972dd  -s ours

Change-Id: Iaaf4c3b0b335bf741452eb5bcd05c03f45d419fc