Merge "[MS06] Add carrier template fields into cloud backup/restore"