Merge "Respond to changes in throttle policy." into froyo