Merge "DO NOT MERGE TokenBucket for rate-limiting and throttling" into nyc-mr2-dev