Merge "Make ThrottleService notice policy changes." into froyo