Merge "Merge "Update the rate limiting parameters to be a bit more strict in...
Merge "Merge "Update the rate limiting parameters to be a bit more strict in limiting, but keep the buffer longer before reset." into tm-dev am: 7d302d09 am: 694bcf3f am: bb5f88e7" into tm-qpr-dev-plus-aosp