Snap for 8746455 from a061d2a87c5583bdc1a266bdf10256fce937f6d0 to tm-release

Change-Id: I6aa4806ef0c1d851367ac938cef830ccae9938a9
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index e596547..5248dc7 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -87,7 +87,7 @@
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Emergency alerts"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Warn about life-threatening events"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Test alerts"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Receive operator tests and monthly tests from the safety alert system"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Receive carrier tests and monthly tests from the safety alert system"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Receive emergency alert: exercise/drill message"</string>
@@ -171,6 +171,6 @@
     <string name="message_copied" msgid="6922953753733166675">"Message copied"</string>
     <string name="top_intro_default_text" msgid="1922926733152511202"></string>
     <string name="top_intro_roaming_text" msgid="186872150397081032">"While you\'re roaming, you may get some alerts that aren\'t included in these settings"</string>
-    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Settings changed by operator"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Settings changed by carrier"</string>
     <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tap to see wireless emergency alert settings"</string>
 </resources>