am 9ef25759: am b6c770e4: am 0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo