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

* commit 'aefc0ed9677233d5e8c991196f970222b4899dc3':
  Don't upgrade some settings from GB to ICS.