Merge commit '3c7318756617c346162e511aff71b889879495d8' * commit '3c7318756617c346162e511aff71b889879495d8': Don't backup/restore telephony material from secure settings
Merge commit '3c7318756617c346162e511aff71b889879495d8' * commit '3c7318756617c346162e511aff71b889879495d8': Don't backup/restore telephony material from secure settings