Merge "Don't upgrade some settings from GB to ICS." into ics-mr1