Merge change 24797 into eclair

* changes:
  Don't backup/restore telephony material from secure settings