Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread