Merge "Refactored area update info support" into oc-dr1-dev

96 files changed, 308 insertions, 291 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 25dc8829b..61b11cebe 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -116,7 +116,7 @@
         <receiver android:name="CellBroadcastAreaInfoReceiver"
             android:permission="android.permission.READ_PHONE_STATE">
             <intent-filter>
-                 <action android:name="android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO" />
+                 <action android:name="com.android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO" />
             </intent-filter>
         </receiver>
 
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 420fdd1ed..ebaf382b9 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibreer"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Gebruik volle volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignoreer ander volume- en Moenie Steur Nie-voorkeure"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Area-opdateringuitsendings"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Wys opdateringinligting in SIM-status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Area-opdateringuitsendings"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Wys opdateringinligting in SIM-status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Ontwikkelaaropsies"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Opletberig-kategorie:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofisies"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8e1d22c1f..be51e1e05 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ንዘር"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ሙሉ ድምጽ ተጠቀም"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ሌላ ድምጽ እና የአትረብሽ ምርጫዎችን ችላ በል"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"የአካባቢ ዝማኔ ስርጭቶች"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"በሲም ሁኔታ ውስጥ የዝማኔ መረጃን አሳይ"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"የአካባቢ ዝማኔ ስርጭቶች"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"በሲም ሁኔታ ውስጥ የዝማኔ መረጃን አሳይ"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"የገንቢዎች አማራጮች"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"የማንቂያ ምድብ፦"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ጂኦፊዚካል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 53dac3da4..6d2a273cf 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"اهتزاز"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"استخدام مستوى الصوت الكامل"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"تجاهل التفضيلات الأخرى لمستوى الصوت وخيار عدم الإزعاج"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"عمليات بث معلومات التحديث المتعلقة بالمنطقة"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"‏إظهار معلومات التحديث في حالة SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"عمليات بث معلومات التحديث المتعلقة بالمنطقة"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"‏إظهار معلومات التحديث في حالة SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"خيارات مطور البرامج"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"فئة التنبيه:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"جيوفيزيائي"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 57188c9b1..75432334a 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrasiya"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Tam səs istifadəsi"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Digər səsi və \"Narahat etməyin\" tərcihlərini iqnor edin"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Ərazi yeniləmə yayımı"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM statusunda güncəlləmə məlumatını göstərin"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Ərazi yeniləmə yayımı"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM statusunda güncəlləmə məlumatını göstərin"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Gəlişdirici seçimləri"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Siqnal Kateqoriyası:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofiziki"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index eb1a09f71..e95b875ba 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibriraj"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Koristi najveću jačinu zvuka"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Zanemaruje druga podešavanja za Jačinu zvuka i Ne uznemiravaj"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Obaveštenja o ažuriranju područja"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Prikazuj informacije o ažuriranju u statusu SIM kartice"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Obaveštenja o ažuriranju područja"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Prikazuj informacije o ažuriranju u statusu SIM kartice"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcije za programera"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorija upozorenja:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizička"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 289b39634..5db2632dc 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вібрацыя"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Уключыць на поўную гучнасць"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ігнараваць іншыя гукі і параметры рэжыму \"Не турбаваць\""</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Апавяшчэнні пра абнаўленні па рэгіёне"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Паказваць інфармацыю пра абнаўленне ў статусе SIM-карты"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Апавяшчэнні пра абнаўленні па рэгіёне"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Паказваць інфармацыю пра абнаўленне ў статусе SIM-карты"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Параметры распрацоўшчыка"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Катэгорыя абвесткi:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геафізічная небяспека"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 765dbfac8..bcb01f94d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вибриране"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Ползв. на пълната сила на звука"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Пренебр. на другите предпоч. за силата на звука и режима „Не безпокойте“"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Излъчвания на актуализации по райони"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Показване на информация за актуализациите в състоянието на SIM картата"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Излъчвания на актуализации по райони"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Показване на информация за актуализациите в състоянието на SIM картата"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Опции на програмиста"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Категория на сигнала:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизични"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index ee8e4360f..2c1b84ba4 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"কম্পন"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"পুরো ভলিউমে শুনুন"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ডু নট ডিস্টার্ব এবং ভলিউমের অন্যান্য পছন্দগুলি অগ্রাহ্য করুন"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"জায়গার আপডেটের সম্প্রচার"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"সিম স্ট্যাটাসে আপডেটের তথ্য দেখুন"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"জায়গার আপডেটের সম্প্রচার"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"সিম স্ট্যাটাসে আপডেটের তথ্য দেখুন"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"বিকাশকারী বিকল্পগুলি"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"সতর্কতা বিভাগ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"জিওফিজিক্যাল"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index e6062d182..ea1a45523 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibracija"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Koristi punu jačinu zvuka"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Zanemari druge postavke jačine zvuka i funkcije Ne ometaj"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Emitiranje informacija o ažuriranju područja"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Prikaz informacija o ažuriranju u statusu SIM kartice"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Emitiranje informacija o ažuriranju područja"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Prikaz informacija o ažuriranju u statusu SIM kartice"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcije za programere"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorija upozorenja:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizičko"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 74d686fbe..80be4e841 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibra"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Utilitza el volum màxim"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignora altres preferències de volum i del mode No molestis"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Difusions d\'informació actualitzada de la zona"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Mostra informació actualitzada a l\'estat de la targeta SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Difusions d\'informació actualitzada de la zona"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostra informació actualitzada a l\'estat de la targeta SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcions per a desenvolupadors"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria de l\'alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísiques"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6ef7d8b29..603fd96b0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrace"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Použít plnou hlasitost"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorovat ostatní předvolby hlasitosti a režimu Nerušit"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Zprávy s místními aktualitami"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Zobrazovat ve stavu SIM karty informace o aktualitách"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Zprávy s místními aktualitami"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Zobrazovat ve stavu SIM karty informace o aktualitách"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Pro vývojáře"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorie upozornění:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofyzikální"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e7e0c9aac..92e1d5953 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibration"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Anvend fuld lydstyrke"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorer andre præferencer for lydstyrke og Forstyr ikke"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Meddelelser om områdeopdatering"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Vis opdateringsoplysninger i SIM-status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Meddelelser om områdeopdatering"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Vis opdateringsoplysninger i SIM-status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Indstillinger for udviklere"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Underretningskategori:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysisk"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4cee5bdde..725156980 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrieren"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Mit voller Lautstärke hören"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Andere Einstellungen für Lautstärke und \"Nicht stören\" ignorieren"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Aktuelle Gebietsinformationen"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Aktuelle Informationen im SIM-Status anzeigen"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Aktuelle Gebietsinformationen"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Aktuelle Informationen im SIM-Status anzeigen"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Entwickleroptionen"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Warnungskategorie:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysik"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e9b5a01d9..ac457cb11 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Δόνηση"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Χρήση πλήρους έντασης"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Παράβλεψη προτιμήσεων έντασης και λειτ. \"Μην ενοχλείτε\""</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Μεταδόσεις ενημέρωσης για την περιοχή"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Εμφάνιση πληροφοριών ενημέρωσης στην κατάσταση SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Μεταδόσεις ενημέρωσης για την περιοχή"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Εμφάνιση πληροφοριών ενημέρωσης στην κατάσταση SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Επιλογές για προγραμματιστές"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Κατηγορία ειδοποίησης:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Γεωφυσικά φαινόμενα"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 424257618..31e5a70b0 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrate"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Area update broadcasts"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Show update information in SIM status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Area update broadcasts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Show update information in SIM status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Alert Category:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysical"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 424257618..31e5a70b0 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrate"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Area update broadcasts"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Show update information in SIM status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Area update broadcasts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Show update information in SIM status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Alert Category:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysical"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 424257618..31e5a70b0 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrate"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Area update broadcasts"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Show update information in SIM status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Area update broadcasts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Show update information in SIM status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Alert Category:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysical"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 107f88056..b5ec0a40d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Usar volumen máximo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorar otras preferencias de volumen y No interrumpir"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Emisiones de información actualizada del área"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Mostrar información de actualización en el estado de la SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Emisiones de información actualizada del área"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostrar información de actualización en el estado de la SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opciones del programador"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoría de alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísicas"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2f59001a9..709e2d22a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"A todo volumen"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorar otras preferencias de volumen y No molestar"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Difusiones de información actualizada sobre la zona"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Mostrar información actualizada en el estado de la SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Difusiones de información actualizada sobre la zona"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostrar información actualizada en el estado de la SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opciones para desarrolladores"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoría de la alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísicas"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 7c322116f..798c5e975 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibreerimine"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Kasutage max helitugevust"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignoreerige muid helitug. ja režiimi Mitte segada eelistusi"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Piirkonna värskenduste edastamine"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM-kaardi olekus kuvatakse värskendamisteave"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Piirkonna värskenduste edastamine"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM-kaardi olekus kuvatakse värskendamisteave"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Arendaja valikud"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Märguandekategooria:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofüüsika"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index afb9e1f00..857a04956 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Egin dar-dar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Erabili bolumen osoa"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Egin ez ikusi bolumenaren eta Ez molestatu moduaren hobespenei"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Inguruko berritasunei buruzko igorpenak"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Erakutsi berritasunei buruzko informazioa SIM txartelaren egoeran"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Inguruko berritasunei buruzko igorpenak"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Erakutsi berritasunei buruzko informazioa SIM txartelaren egoeran"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Garatzaileen aukerak"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Alerten kategoria:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofisikoak"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 600ada561..0d2d0dd48 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"لرزش"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"استفاده از میزان صدای کامل"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"نادیده گرفتن سایر تنظیمات برگزیده «مزاحم نشوید» و میزان صدا"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"پخش‌های به‌روزرسانی منطقه"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"نمایش اطلاعات به‌روزرسانی در وضعیت سیم‌کارت"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"پخش‌های به‌روزرسانی منطقه"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"نمایش اطلاعات به‌روزرسانی در وضعیت سیم‌کارت"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"گزینه‌های برنامه‌نویسان"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"دسته هشدار:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ژئوفیزیکی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a05c4dd06..908e9c8d7 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Värinä"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Täysi äänenvoimakkuus"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ohita muut volyymi- ja Älä häiritse ‑valinnat."</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Alueelliset ilmoitukset"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Näytä päivitystiedot SIM-kortin tilassa."</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Alueelliset ilmoitukset"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Näytä päivitystiedot SIM-kortin tilassa."</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Kehittäjäasetukset"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Ilmoitusluokka:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysikaalinen"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ef54153aa..a832a4e56 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibreur"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Utiliser le plein volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorer autres préférences de volume et de Ne pas déranger"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Diffusion de mises à jour régionales"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Afficher les données de mise à jour dans l\'état de la carte SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Diffusion de mises à jour régionales"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Afficher les données de mise à jour dans l\'état de la carte SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Options pour les concepteurs"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Catégorie d\'alerte :"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Géophysique"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1d69c3b47..061187e08 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibreur"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Utiliser le volume maximal"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorer autres préférences volume et \"Ne pas déranger\""</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Diffusion des dernières informations locales"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Afficher les dernières informations dans l\'état de la carte SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Diffusion des dernières informations locales"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Afficher les dernières informations dans l\'état de la carte SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Options pour les développeurs"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Catégorie d\'alerte :"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Géophysique"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 01c587904..e052ea063 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Usar volume completo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignora outras preferencias de volume e de Non molestar"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Emisións de información actualizada sobre a zona"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Mostra información actualizada no estado da SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Emisións de información actualizada sobre a zona"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostra información actualizada no estado da SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcións de programador"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoría de alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Xeofísicas"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 0dd70bdb8..aa3946278 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"વાઇબ્રેટ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"પૂર્ણ વૉલ્યૂમનો ઉપયોગ કરો"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"અન્ય વૉલ્યૂમ અને ખલેલ પાડશો નહીં પસંદગીઓને અવગણો"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"વિસ્તારના અપડેટ વિશેના બ્રૉડકાસ્ટ"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"અપડેટ વિશેની માહિતી SIMની સ્થિતિમાં બતાવો"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"વિસ્તારના અપડેટ વિશેના બ્રૉડકાસ્ટ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"અપડેટ વિશેની માહિતી SIMની સ્થિતિમાં બતાવો"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"વિકાસકર્તાનાં વિકલ્પો"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ચેતવણીની કૅટેગરી:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ભૂભૌતિકીય"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 54834b912..df66e05fd 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"कंपन"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"पूरे वॉल्यूम का उपयोग करें"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"अन्य वॉल्यूम और परेशान न करें प्राथमिकताओं को अनदेखा करें"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"क्षेत्र अपडेट प्रसारण"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM स्थिति में अपडेट जानकारी दिखाएं"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"क्षेत्र अपडेट प्रसारण"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM स्थिति में अपडेट जानकारी दिखाएं"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"डेवलपर विकल्प"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"अलर्ट श्रेणी:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"भूभौतिकीय"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8e982ca5d..9000d8e5c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibracija"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Koristi punu glasnoću"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Zanemari druge postavke glasnoće i značajke Ne uznemiravaj"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Emitiranja obavijesti za područje"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Prikaži informacije o obavijestima u statusu SIM-a"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Emitiranja obavijesti za područje"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Prikaži informacije o obavijestima u statusu SIM-a"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcije za razvojne programere"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorija upozorenja:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizičko"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 88c9f4c80..adc7ada92 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Rezgés"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Teljes hangerő használata"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Mellőz minden más hang- és „Ne zavarjanak”-beállítást"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Területalapú frissítések sugárzása"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"A frissítési adatok megjelenítése a SIM-kártya állapotában"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Területalapú frissítések sugárzása"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"A frissítési adatok megjelenítése a SIM-kártya állapotában"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Fejlesztői beállítások"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Értesítési kategória:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizika"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 98ea2545b..5c2340abf 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Թրթռոց"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Օգտագործել ձայնի ողջ ուժգնությունը"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Անտեսել ձայնի ուժգնության և Չանհանգստացնել ռեժիմի այլ կարգավորումները"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Տարածքի թարմացված տվյալների հեռարձակումներ"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Թարմացման մասին տեղեկությունները ցուցադրել SIM-ի կարգավիճակում"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Տարածքի թարմացված տվյալների հեռարձակումներ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Թարմացման մասին տեղեկությունները ցուցադրել SIM-ի կարգավիճակում"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Մշակողի ընտրանքներ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Զգուշացման բաժինը՝"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Երկրաֆիզիկական"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 51dd20dbe..8bf69b455 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Getar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Gunakan volume penuh"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Abaikan volume lain dan preferensi Jangan Ganggu"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Siaran update area"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Tampilan informasi update di status SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Siaran update area"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Tampilan informasi update di status SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opsi developer"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategori Lansiran:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofisika"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 566be79c7..441a40045 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Titringur"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Nota fullan hljóðstyrk"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Hunsa aðrar stillingar fyrir hljóðstyrk og „Ónáðið ekki“"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Staðbundnar uppfærslur"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Sýna uppfærsluupplýsingar í SIM-stöðu"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Staðbundnar uppfærslur"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Sýna uppfærsluupplýsingar í SIM-stöðu"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Forritunarkostir"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Flokkur viðvörunar:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Jarðeðlisfræði"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8aeece7c9..ddce78130 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrazione"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Usa volume massimo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignora altre preferenze per Volume e Non disturbare"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Trasmissioni degli aggiornamenti relativi alla zona"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Mostra le informazioni di aggiornamento nello stato della SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Trasmissioni degli aggiornamenti relativi alla zona"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostra le informazioni di aggiornamento nello stato della SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opzioni sviluppatore"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria avviso:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofisici"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 52450d78a..e4ed9f968 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"רטט"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"השתמש בעוצמת קול מלאה"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"התעלם מהעדפות אחרות של עוצמת הקול והמצב \'נא לא להפריע\'"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"שידורי עדכונים רלוונטיים לאזור"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"‏הצגת פרטי עדכון בסטטוס SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"שידורי עדכונים רלוונטיים לאזור"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"‏הצגת פרטי עדכון בסטטוס SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"אפשרויות מפתח"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"קטגוריית התרעה:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"גיאופיזית"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e54f71f50..c0734e1f3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"バイブレーション"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"最大音量を使用する"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"その他の音量やマナーモードの設定は無視されます"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"エリア更新メッセージ"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM ステータスに更新情報を表示します"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"エリア更新メッセージ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM ステータスに更新情報を表示します"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"開発者向けオプション"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"警報のカテゴリ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"地球物理"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 86db43945..aa1f5e20a 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ვიბრაცია"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"სრული ხმის გამოყენება"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ხმის დამატებითი პარამეტრების და „არ შემაწუხოთ“ პარამეტრის იგნორირება"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"მდებარეობაზე მორგებული განახლებების მიღება"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"განახლების ინფორმაციის SIM ბარათის სტატუსში ჩვენება"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"მდებარეობაზე მორგებული განახლებების მიღება"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"განახლების ინფორმაციის SIM ბარათის სტატუსში ჩვენება"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"პარამეტრები დეველოპერებისთვის"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"გაფრთხილების კატეგორია:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"გეოფიზიკური"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 2512a39a6..eda6dd313 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Дірілдеу"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Толық көлемін пайдалану"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Басқа көлемді және \"Мазаламаңыз\" параметрлерін елемеу"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Жергілікті жаңартылған ақпаратты тарату"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM күйінде жаңарту ақпаратын көрсету"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Жергілікті жаңартылған ақпаратты тарату"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM күйінде жаңарту ақпаратын көрсету"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Дамытушы опциялары"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Дабыл санаты:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизикалық"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b0aebcfcc..c189f1049 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ញ័រ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ប្រើកម្រិតសំឡេងពេញ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"មិនអើពើនឹងសំឡេងផ្សេងទៀត និងចំណូល​ចិត្ត​មុខងារ​កុំ​រំខាន"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"ការផ្សាយបច្ចុប្បន្នភាពតំបន់"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"បង្ហាញ​ព័ត៌មាន​បច្ចុប្បន្ន​ភាព​នៅ​ក្នុង​ស្ថានភាព​ស៊ីម"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ការផ្សាយបច្ចុប្បន្នភាពតំបន់"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"បង្ហាញ​ព័ត៌មាន​បច្ចុប្បន្ន​ភាព​នៅ​ក្នុង​ស្ថានភាព​ស៊ីម"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ជម្រើស​សម្រាប់​​អ្នក​អភិវឌ្ឍ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ប្រភេទ​រំលឹក៖"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"កត្តា​ភូមិសាស្ត្រ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 001437c27..cffba677a 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ವೈಬ್ರೇಟ್‌"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ಪೂರ್ಣ ವಾಲ್ಯೂಮ್‌ ಬಳಸಿ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ಇತರೆ ವಾಲ್ಯೂಮ್ ಮತ್ತು ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಎಂಬ ಆದ್ಯತೆಗಳನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"ಪ್ರದೇಶ ಅಪ್‌ಡೇಟ್‌ ಪ್ರಸಾರಗಳು"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"ಸಿಮ್ ಸ್ಥಿತಿಯಲ್ಲಿ ಅಪ್‌ಡೇಟ್‌‌ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಿ"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ಪ್ರದೇಶ ಅಪ್‌ಡೇಟ್‌ ಪ್ರಸಾರಗಳು"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"ಸಿಮ್ ಸ್ಥಿತಿಯಲ್ಲಿ ಅಪ್‌ಡೇಟ್‌‌ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಿ"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳು"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ಎಚ್ಚರಿಕೆ ವಿಭಾಗ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ಭೂಭೌತ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6427b1b1b..f34d7de46 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"진동"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"최대 볼륨 사용"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"기타 볼륨 및 알림 일시중지 환경설정 무시"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"지역 업데이트 방송"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM 상태의 업데이트 정보를 표시합니다."</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"지역 업데이트 방송"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM 상태의 업데이트 정보를 표시합니다."</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"개발자 옵션"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"알리미 카테고리:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"지구 물리"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 82aea468a..caf3cec96 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Дирилдөө"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Болушунча катуу угуу"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Үн көзөмөлдөгүчүнүн жана \"Тынчымды алба\" функциясынын жөндөөлөрүн көз жаздымда калтыруу"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Аймакты жаңыртуу боюнча таркатмалар"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM-картанын абалы тууралуу жаңыртылган маалымат көрсөтүлсүн"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Аймакты жаңыртуу боюнча таркатмалар"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM-картанын абалы тууралуу жаңыртылган маалымат көрсөтүлсүн"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Иштеп чыгуучунун параметрлери"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Айгай кабарынын категориясы:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизакалык"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 646950c63..807030db8 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ສັ່ນເຕືອນ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ໃຊ້ລະດັບສຽງເຕັມ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ຍົກເລີກການຕັ້ງຄ່າລະດັບສຽງ ແລະ ຫ້າມລົບກວນອື່ນ"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"ການປະກາດອັບເດດພື້ນທີ່"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"ສະແດງຂໍ້ມູນອັບເດດໃນສະຖານະຊິມ"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ການປະກາດອັບເດດພື້ນທີ່"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"ສະແດງຂໍ້ມູນອັບເດດໃນສະຖານະຊິມ"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ໂຕເລືອກນັກພັດທະນາ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ໝວດໝູ່ການແຈ້ງເຕືອນ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ທໍລະນີວັດຖຸ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 26997311c..5fcefe76f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibruoti"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Naudoti visą garsumą"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignoruoti kitas garsumo ir netrukdymo režimo nuostatas"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Srities atnaujinimo transliacija"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Rodyti naujinio informaciją SIM būsenos srityje"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Srities atnaujinimo transliacija"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Rodyti naujinio informaciją SIM būsenos srityje"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Kūrėjo parinktis"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Įspėjimo kategorija:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizinis"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index e27554fe9..85923d1e5 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrācija"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Izmantot pilnu skaļumu"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorēt citas skaļuma un režīma “Netraucēt” preferences"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Apgabala atjauninājumu apraide"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Rādīt jaunāko informāciju SIM statusā"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Apgabala atjauninājumu apraide"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Rādīt jaunāko informāciju SIM statusā"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Izstrādātājiem paredzētās opcijas"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Brīdinājuma kategorija:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Ģeofizikāli procesi"</string>
diff --git a/res/values-mcc404/config.xml b/res/values-mcc404/config.xml
new file mode 100644
index 000000000..59439fa05
--- /dev/null
+++ b/res/values-mcc404/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string-array name="additional_cbs_channels_strings" translatable="false">
+        <!-- Channel 60 for area update info is required by Indian government -->
+        <item>0x03C:type=area, emergency=false</item>
+    </string-array>
+</resources>
diff --git a/res/values-mcc724/config.xml b/res/values-mcc724/config.xml
index ea98c4c34..b5ae0d81f 100644
--- a/res/values-mcc724/config.xml
+++ b/res/values-mcc724/config.xml
@@ -16,7 +16,7 @@
 
 <resources>
     <string-array name="additional_cbs_channels_strings" translatable="false">
-        <!-- Channel 50 is required by Brazilian government -->
-        <item>0x032:type=other, emergency=false</item>
+        <!-- Channel 50 for area update info is required by Brazilian government -->
+        <item>0x032:type=area, emergency=false</item>
     </string-array>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 8463ab406..4b2d31b5e 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вибрации"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Користете макс. јачина на звук"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Занемари други пост. за јачина на звук и „Не вознемирувај“"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Емитување локални информации за состојбата"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Прикажувај информации за состојбата во статусот на SIM-картичката"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Емитување локални информации за состојбата"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Прикажувај информации за состојбата во статусот на SIM-картичката"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Програмерски опции"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Категории на предупредувања:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизички"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 59ccee79d..747ec2798 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"പൂർണ്ണ വോളിയം ഉപയോഗിക്കുക"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"മറ്റുള്ള വോളിയവും \'ശല്യപ്പെടുത്തരുത്\' മുൻഗണനകളും ഒഴിവാക്കുക"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"ഏരിയ അപ്‌ഡേറ്റ് ബ്രോഡ്‌കാസ്റ്റുകൾ"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"സിം സ്റ്റാറ്റസിൽ ഏറ്റവും പുതിയ വിവരങ്ങൾ കാണിക്കുക"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ഏരിയ അപ്‌ഡേറ്റ് ബ്രോഡ്‌കാസ്റ്റുകൾ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"സിം സ്റ്റാറ്റസിൽ ഏറ്റവും പുതിയ വിവരങ്ങൾ കാണിക്കുക"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ഡെവലപ്പർ ഓ‌പ്ഷനുകൾ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"അലേർട്ട് വിഭാഗം:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ജിയോഫിസിക്കൽ"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 681c6ca87..3dde90ffb 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Чичиргээ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Хамгийн чангаар тохируулах"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Бусад дууны түвшинг үл хэрэгсэх, Бүү саад бол тохиргоо"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Газрын шинэчлэлтийн дамжуулалт"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Шинэчлэлтийн мэдээллийг SIM-н төлөвт харуулах"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Газрын шинэчлэлтийн дамжуулалт"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Шинэчлэлтийн мэдээллийг SIM-н төлөвт харуулах"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Хөгжүүлэгчийн тохиргоо"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Сэрэмжлүүлгийн Ангилал:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизик"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1c9f0cce5..a0be8fc36 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"कंपन होणे"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"पूर्ण व्‍हॉल्‍यूम वापरा"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"अन्‍य व्‍हॉल्‍यूम आणि व्‍यत्‍यय आणू नका प्राधान्‍यांकडे दुर्लक्ष करा"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"परिसराशी संबंधित अपडेट ब्रॉडकास्ट"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"सिमच्‍या स्थितीत अपडेटची काही माहिती असल्‍यास दाखवा"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"परिसराशी संबंधित अपडेट ब्रॉडकास्ट"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"सिमच्‍या स्थितीत अपडेटची काही माहिती असल्‍यास दाखवा"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"विकासक पर्याय"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"सूचना श्रेणी:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"भूभौतिक"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 8300d604e..f10799dab 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Getar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Gunakan kelantangan penuh"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Abaikan pilihan kelantangan yang lain dan Jangan Ganggu"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Siaran kemas kini kawasan"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Tunjukkan maklumat kemas kini dalam status SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Siaran kemas kini kawasan"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Tunjukkan maklumat kemas kini dalam status SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Pilihan pembangun"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategori Awasan:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizikal"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 1d0e2fdc4..76b9b3570 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"တုန်ခါမှု"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"အသံအကျယ်ကိုသုံးပါ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"အခြား အသံနှင့် မနှောင့်ယှက်ရ ရွေးချယ်မှု ကိုပစ်ထားလိုက်ပါ"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"နယ်မြေအပ်ဒိတ် ထုတ်လွှင့်ခြင်းများ"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"ဆင်းမ်ကဒ်အခြေအနေတွင် အပ်ဒိတ်အချက်အလက်များကို ပြသရန်"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"နယ်မြေအပ်ဒိတ် ထုတ်လွှင့်ခြင်းများ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"ဆင်းမ်ကဒ်အခြေအနေတွင် အပ်ဒိတ်အချက်အလက်များကို ပြသရန်"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ပြုစုပေးခဲ့သူ၏ ရွေးချယ်မှုများ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"သတိပေးချက် အမျိုးအစား:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ဘူမိရုပ်ပိုင်းဆိုင်ရာ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index db53bdc40..5c7ce20f3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrer"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Bruk fullt volum"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorer andre innstillinger for volum og Ikke forstyrr"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Kringkastinger av områdeoppdateringer"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Vis oppdateringsinformasjon i SIM-status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Kringkastinger av områdeoppdateringer"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Vis oppdateringsinformasjon i SIM-status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Utvikleralternativer"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Varselkategori:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysisk"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 40264e0de..0cbd39713 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"भाइब्रेट गर्नुहोस्"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"पूर्ण भोल्युम प्रयोग गर्नुहोस्"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"अन्य भोल्युम र बाधा नपुऱ्याउनुहोस्-का प्राथमिकतालाई बेवास्ता गर्नुहोस्"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"क्षेत्रसम्बन्धी अद्यावधिकका प्रसारणहरू"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM को स्थितिमा अद्यावधिकसम्बन्धी जानकारी देखाउनुहोस्‌"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"क्षेत्रसम्बन्धी अद्यावधिकका प्रसारणहरू"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM को स्थितिमा अद्यावधिकसम्बन्धी जानकारी देखाउनुहोस्‌"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"विकासकर्ताका विकल्पहरू"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"चेतावनी कोटी:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"भूभौतिक"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 197336b43..a4da67167 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Trillen"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Maximumvolume gebruiken"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Andere voorkeuren voor volume en \'Niet storen\' negeren"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Broadcasts met lokale informatie"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Updategegevens weergeven in simkaartstatus"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Broadcasts met lokale informatie"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Updategegevens weergeven in simkaartstatus"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opties voor ontwikkelaars"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Meldingscategorie:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysisch"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 37b2331ca..5c4ca4194 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ਪੂਰੀ ਵੌਲਿਊਮ ਦੀ ਵਰਤੋਂਂ ਕਰੋ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ਹੋਰ ਵੌਲਿਊਮ ਅਤੇ \'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਤਰਜੀਹਾਂ ਨੂੰ ਅਣਡਿੱਠ ਕਰੋ"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"ਖੇਤਰ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਦੇ ਪ੍ਰਸਾਰਣ"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM ਅਵਸਥਾ ਵਿੱਚ ਅੱਪਡੇਟ ਦੀ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ਖੇਤਰ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਦੇ ਪ੍ਰਸਾਰਣ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM ਅਵਸਥਾ ਵਿੱਚ ਅੱਪਡੇਟ ਦੀ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ਵਿਕਾਸਕਾਰ ਚੋਣਾਂ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ਚਿਤਾਵਨੀ ਸ਼੍ਰੇਣੀ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ਜਿਓਫਿਜੀਕਲ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5bf063a24..5a862dad2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Wibracje"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Użyj maksymalnej głośności"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignoruj inne ustawienia głośności i trybu Nie przeszkadzać"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Aktualne informacje z danego obszaru"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Pokaż aktualne informacje w ramach stanu karty SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Aktualne informacje z danego obszaru"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Pokaż aktualne informacje w ramach stanu karty SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcje programistyczne"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategoria alertu:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Zagrożenie geofizyczne"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f0a165ace..ae29692b0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Utilizar volume máximo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorar preferências de Não incomodar e de volume"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Transmissões de atualização de área"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Mostrar informações de atualização no estado do SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Transmissões de atualização de área"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostrar informações de atualização no estado do SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opções de programador"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria de Alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísico"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6d7db65e4..3fd858d59 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Usar volume máximo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorar outras preferências de \"Não perturbe\" e volume"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Transmissões de atualização de área"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Mostrar informações de atualização no status do SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Transmissões de atualização de área"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostrar informações de atualização no status do SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opções do desenvolvedor"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria de alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísico"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6b8859e9f..4ad38dbd9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrare"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Selectați volum maxim"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorați alte preferințe privind volumul și modul Nu deranja"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Difuzarea actualizărilor despre zonă"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Afișați informațiile despre actualizare în starea cardului SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Difuzarea actualizărilor despre zonă"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Afișați informațiile despre actualizare în starea cardului SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opțiuni pentru dezvoltatori"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria alertei:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizic"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 52e89c5c2..49c39869a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вибросигнал"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Включить полную громкость"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Игнорировать другие настройки звука и режима \"Не беспокоить\""</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Аварийные оповещения"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Показывать информацию об обновлении в статусе SIM-карты"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Аварийные оповещения"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Показывать информацию об обновлении в статусе SIM-карты"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Для разработчиков"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Категория оповещения:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Землетрясение"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index a89e788b6..698e499b3 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"කම්පනය"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"පූර්ණ හඬ පරිමාව භාවිත කරන්න"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"වෙනත් හඬ පරිමාව සහ බාධා නොකරන්න මනාප නොසලකා හරින්න"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"ප්‍රදේශ යාවත්කාලීන තොරතුරු"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM තත්ත්වය තුළ යාවත්කාලීන තොරතුරු පෙන්වන්න"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ප්‍රදේශ යාවත්කාලීන තොරතුරු"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM තත්ත්වය තුළ යාවත්කාලීන තොරතුරු පෙන්වන්න"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"සංවර්ධක විකල්ප"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ඇඟවීමේ ප්‍රවර්ගය:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"භූ භෞතික"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index eca6ca384..7ff5a496c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrovať"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Použiť plnú hlasitosť"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Predvoľby Ignorovať ďalšie nastavenia hlasitosti a Nerušiť"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Vysielania s aktuálnymi informáciami oblasti"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Zobrazovať informácie o aktualizácii v stave SIM karty"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Vysielania s aktuálnymi informáciami oblasti"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Zobrazovať informácie o aktualizácii v stave SIM karty"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Pre vývojárov"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategória upozornenia:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofyzikálne"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3eb539ea9..ee3d904a2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibriranje"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Uporabi največjo glasnost"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Prezri druge nastavitve glasnosti in načina »ne moti«"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Oddaje z najnovejšimi območnimi informacijami"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Prikaz najnovejših informacij pri stanju kartice SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Oddaje z najnovejšimi območnimi informacijami"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Prikaz najnovejših informacij pri stanju kartice SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Možnosti za razvijalce"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorija opozorila:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizična"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index cb0634e37..f1831c5f8 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Dridhje"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Përdor volumin e plotë"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Shpërfill volumin tjetër dhe preferencat e \"Mos shqetëso\""</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Transmetimet e përditësimeve për zonën"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Shfaq informacionet e përditësimit në statusin e kartës SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Transmetimet e përditësimeve për zonën"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Shfaq informacionet e përditësimit në statusin e kartës SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opsionet e zhvilluesit"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategoria e alarmit:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Gjeofizik"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 1c362909a..b82c5d5a1 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вибрирај"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Користи највећу јачину звука"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Занемарује друга подешавања за Јачину звука и Не узнемиравај"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Обавештења о ажурирању подручја"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Приказуј информације о ажурирању у статусу SIM картице"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Обавештења о ажурирању подручја"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Приказуј информације о ажурирању у статусу SIM картице"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Опције за програмера"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Категорија упозорења:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизичка"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9d8e09e9f..f4c81451f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrera"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Använd högsta volym"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorera andra inställningar för volym och Stör ej"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Sändningar för områdesuppdateringar"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Visa uppdateringsinformation i SIM-statusen"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Sändningar för områdesuppdateringar"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Visa uppdateringsinformation i SIM-statusen"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Utvecklaralternativ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Varningskategori:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysiska"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 5ea861016..cf1366534 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Tetema"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Tumia sauti kamili"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Puuza mapendeleo mengine ya Usinisumbue na sauti"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Matangazo ya taarifa ya eneo"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Onyesha maelezo ya taarifa kwenye hali ya SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Matangazo ya taarifa ya eneo"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Onyesha maelezo ya taarifa kwenye hali ya SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Chaguo za wasanidi programu"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kitengo cha Arifa:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Jiofizikia"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 820e15956..ecea37b82 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"அதிர்வு"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"முழு ஒலியைப் பயன்படுத்து"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"மற்ற ஒலி மற்றும் தொந்தரவு செய்ய வேண்டாம் விருப்பத்தேர்வுகளைப் புறக்கணிக்கும்"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"பகுதி பற்றிய புதிய பிராட்காஸ்ட் அறிவிப்புகள்"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"சிம் நிலையில் புதிய தகவலைக் காட்டு"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"பகுதி பற்றிய புதிய பிராட்காஸ்ட் அறிவிப்புகள்"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"சிம் நிலையில் புதிய தகவலைக் காட்டு"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"டெவெலப்பர் விருப்பங்கள்"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"விழிப்பூட்டல் வகை:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"புவியமைப்பியல்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 78245c763..982acccca 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"వైబ్రేట్ చేయడం"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"పూర్తి వాల్యూమ్‌ను ఉపయోగించు"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ఇతర వాల్యూమ్ మరియు అంతరాయం కలిగించవద్దు ప్రాధాన్యతలను విస్మరిస్తుంది"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"ప్రాంతీయ అప్‌డేట్ ప్రసారాలు"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM స్థితిలో అప్‌డేట్ సమాచారాన్ని చూపు"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ప్రాంతీయ అప్‌డేట్ ప్రసారాలు"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM స్థితిలో అప్‌డేట్ సమాచారాన్ని చూపు"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"డెవలపర్ ఎంపికలు"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"హెచ్చరిక వర్గం:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"భూభౌతిక సంబంధితం"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 62741107e..c97e01055 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"สั่น"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ใช้เสียงเต็มระดับ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ละเว้นระดับเสียงอื่นๆ และค่ากำหนด \"ห้ามรบกวน\""</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"การเผยแพร่การอัปเดตในพื้นที่"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"แสดงข้อมูลอัปเดตในสถานะซิม"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"การเผยแพร่การอัปเดตในพื้นที่"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"แสดงข้อมูลอัปเดตในสถานะซิม"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ตัวเลือกสำหรับนักพัฒนาซอฟต์แวร์"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"หมวดหมู่การแจ้งเตือน:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ธรณีฟิสิกส์"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index d073c2d86..215cf3cc4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Mag-vibrate"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Gamitin ang sagad na volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Balewalain ang mga kagustuhan sa volume at Huwag Istorbohin"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Mga broadcast sa pag-update sa lugar"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Ipakita ang impormasyon ng pag-update sa status ng SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Mga broadcast sa pag-update sa lugar"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Ipakita ang impormasyon ng pag-update sa status ng SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Mga pagpipilian ng developer"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorya ng Alerto:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysical"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1b3068a01..a441c7b2e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Titreşim"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"En yüksek sesi kullan"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Diğer ses ve Rahatsız Etme tercihlerini yok say"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Alan güncelleme yayınları"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM durumunda güncelleme bilgilerini göster"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Alan güncelleme yayınları"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM durumunda güncelleme bilgilerini göster"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Geliştirici seçenekleri"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Uyarı Kategorisi:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Jeofizik"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0d8f19183..acabeb49b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вібросигнал"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Використовувати повну гучність"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ігнорувати інші параметри гучності й режиму \"Не турбувати\""</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Широкомовні сповіщення про регіональні оновлення"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Показувати інформацію про оновлення в статусі SIM-карти"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Широкомовні сповіщення про регіональні оновлення"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Показувати інформацію про оновлення в статусі SIM-карти"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Параметри розробника"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Категорія сповіщення:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофізична небезпека"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 73b624724..8058ade09 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"وائبریٹ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"پورا والیوم استعمال کریں"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"دیگر والیوم اور ڈسٹرب نہ کریں کی ترجیحات کو نظر انداز کریں"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"علاقائی اپ ڈیٹ کے نشریات"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"‏SIM کی صورتحال میں موجود اپ ڈیٹ کی معلومات دکھائیں"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"علاقائی اپ ڈیٹ کے نشریات"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"‏SIM کی صورتحال میں موجود اپ ڈیٹ کی معلومات دکھائیں"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ڈیولپر کے اختیارات"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"الرٹ کا زمرہ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ارضی طبیعیات سے متعلق"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 523bcb106..5726c2d61 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Tebranish"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Maksimal ovoz balandligidan foydalanish"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Boshqa ovoz balandligi va Bezovta qilinmasin rejimi sozlamalarini inkor etish"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Favqulodda ogohlantirishlar"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"SIM holati panelida yangilash axborotini ko‘rsatish"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Favqulodda ogohlantirishlar"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM holati panelida yangilash axborotini ko‘rsatish"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Dasturchi sozlamalari"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Ogohlantirish toifasi:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Zilzila"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f5e13ecba..e7b7e4e00 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Rung"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Sử dụng mức âm lượng cao nhất"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Bỏ qua tùy chọn âm lượng khác và Không làm phiền"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Chương trình phát sóng thông tin cập nhật khu vực"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Hiển thị thông tin cập nhật trong trạng thái SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Chương trình phát sóng thông tin cập nhật khu vực"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Hiển thị thông tin cập nhật trong trạng thái SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Tùy chọn nhà phát triển"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Danh mục cảnh báo:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Địa vật lý"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1805549a9..2c8b0ab73 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"振动"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"使用最大音量"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"忽略其他的音量和“勿扰”偏好设置"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"区域动态信息广播"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"在 SIM 卡状态中显示动态信息"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"区域动态信息广播"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"在 SIM 卡状态中显示动态信息"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"开发者选项"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"警报类别："</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"地球物理"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b99dd0ec3..8cde0a3d6 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"震動"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"使用最大音量"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"忽略其他音量和「請勿騷擾」偏好設定"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"地區最新資訊廣播"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"在 SIM 卡狀態中顯示最新資訊"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"地區最新資訊廣播"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"在 SIM 卡狀態中顯示最新資訊"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"開發人員選項"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"警報類別："</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"地球物理"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 33f2078f0..f56e5dbf2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"震動"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"使用最大音量"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"忽略其他的音量和「零打擾」偏好設定"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"地區最新資訊廣播"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"在 SIM 卡狀態中顯示最新資訊"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"地區最新資訊廣播"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"在 SIM 卡狀態中顯示最新資訊"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"開發人員選項"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"警示類別："</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"地球物理災變"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 404f7b625..10281b85b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -67,8 +67,8 @@
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Dlidliza"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Sebenzisa ivolomu ephelele"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ziba enye ivolomu kanye nezintandokazi zokuthi ungaphazamisi"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2793444925039251306">"Ukusakazwa kwesibuyekezo sendawo"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="1638919917695623789">"Bonisa ulwazi lokubuyekeza kusimo se-SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Ukusakazwa kwesibuyekezo sendawo"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Bonisa ulwazi lokubuyekeza kusimo se-SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Izinketho Zonjiniyela"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Isigaba sesexwayiso:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Okuphathelene Nomhlaba"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 2e9601e46..db592ae82 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -21,8 +21,6 @@
     <bool name="use_full_volume">false</bool>
     <!-- Whether to enable CMAS settings (United States) -->
     <bool name="show_cmas_settings">true</bool>
-    <!-- Whether to enable channel 50 settings (Brazil) -->
-    <bool name="show_brazil_settings">false</bool>
     <!-- Whether to append date-time to the alert title -->
     <bool name="show_date_time_title">false</bool>
     <!-- Additional cell broadcast channels to enable -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b97b881b2..6d399387d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -141,9 +141,9 @@
     <string name="use_full_volume_summary">Ignore other volume and Do Not Disturb preferences</string>
 
     <!-- Preference title for enable area update information broadcasts. [CHAR LIMIT=50] -->
-    <string name="enable_channel_50_alerts_title">Area update broadcasts</string>
+    <string name="enable_area_update_info_alerts_title">Area update broadcasts</string>
     <!-- Preference summary for enable area update information broadcasts. [CHAR LIMIT=100] -->
-    <string name="enable_channel_50_alerts_summary">Show update information in SIM status</string>
+    <string name="enable_area_update_info_alerts_summary">Show update information in SIM status</string>
 
     <!-- Preference category title for developer settings. [CHAR LIMIT=50] -->
     <string name="category_dev_settings_title">Developer options</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 996562738..71f9a776b 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -46,12 +46,12 @@
                             android:summary="@string/enable_cmas_severe_threat_alerts_summary"
                             android:title="@string/enable_cmas_severe_threat_alerts_title" />
 
-        <!-- Default value is true for Brazil. This preference is ignored and hidden
-        unless the boolean "show_brazil_settings" is set to true in config.xml. -->
+        <!-- Default value is true for Brazil and India. This preference is ignored and hidden
+        unless the boolean "config_showAreaUpdateInfoSettings" is set to true in the global resource. -->
         <SwitchPreference android:defaultValue="true"
-                          android:key="enable_channel_50_alerts"
-                          android:summary="@string/enable_channel_50_alerts_summary"
-                          android:title="@string/enable_channel_50_alerts_title" />
+                          android:key="enable_area_update_info_alerts"
+                          android:summary="@string/enable_area_update_info_alerts_summary"
+                          android:title="@string/enable_area_update_info_alerts_title" />
 
         <Preference android:key="emergency_alert_history"
                     android:title="@string/emergency_alert_history_title" />
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
index 5f15944bd..75e0e0528 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
@@ -41,6 +41,8 @@ import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import com.android.cellbroadcastreceiver.CellBroadcastAlertService.AlertType;
+
 import java.util.Locale;
 import java.util.MissingResourceException;
 
@@ -111,14 +113,6 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
     private TelephonyManager mTelephonyManager;
     private int mInitialCallState;
 
-    public enum ToneType {
-        CMAS_DEFAULT,
-        ETWS_DEFAULT,
-        EARTHQUAKE,
-        TSUNAMI,
-        OTHER
-    }
-
     // Internal messages
     private static final int ALERT_SOUND_FINISHED = 1000;
     private static final int ALERT_PAUSE_FINISHED = 1001;
@@ -345,11 +339,11 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
         }
 
         if (mEnableAudio || mEnableVibrate) {
-            ToneType toneType = ToneType.CMAS_DEFAULT;
+            AlertType alertType = AlertType.CMAS_DEFAULT;
             if (intent.getSerializableExtra(ALERT_AUDIO_TONE_TYPE) != null) {
-                toneType = (ToneType) intent.getSerializableExtra(ALERT_AUDIO_TONE_TYPE);
+                alertType = (AlertType) intent.getSerializableExtra(ALERT_AUDIO_TONE_TYPE);
             }
-            playAlertTone(toneType);
+            playAlertTone(alertType);
         } else {
             stopSelf();
             return START_NOT_STICKY;
@@ -367,13 +361,13 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
 
     /**
      * Start playing the alert sound.
-     * @param toneType the alert tone type (e.g. default, earthquake, tsunami, etc..)
+     * @param alertType the alert type (e.g. default, earthquake, tsunami, etc..)
      */
-    private void playAlertTone(ToneType toneType) {
+    private void playAlertTone(AlertType alertType) {
         // stop() checks to see if we are already playing.
         stop();
 
-        log("playAlertTone: toneType=" + toneType);
+        log("playAlertTone: alertType=" + alertType);
 
         // Vibration duration in milliseconds
         long vibrateDuration = 0;
@@ -425,7 +419,7 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
                 log("Locale=" + getResources().getConfiguration().getLocales());
 
                 // Load the tones based on type
-                switch (toneType) {
+                switch (alertType) {
                     case EARTHQUAKE:
                         setDataSourceFromResource(getResources(), mMediaPlayer,
                                 R.raw.etws_earthquake);
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index 97cba12a5..5e4864c0f 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -28,6 +28,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -47,11 +48,9 @@ import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
-import com.android.cellbroadcastreceiver.CellBroadcastAlertAudio.ToneType;
 import com.android.cellbroadcastreceiver.CellBroadcastChannelManager.CellBroadcastChannelRange;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.gsm.SmsCbConstants;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -80,7 +79,9 @@ public class CellBroadcastAlertService extends Service {
 
     /** Sticky broadcast for latest area info broadcast received. */
     static final String CB_AREA_INFO_RECEIVED_ACTION =
-            "android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
+            "com.android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
+
+    static final String SETTINGS_APP = "com.android.settings";
 
     /** Intent extra for passing a SmsCbMessage */
     private static final String EXTRA_MESSAGE = "message";
@@ -92,6 +93,18 @@ public class CellBroadcastAlertService extends Service {
     private static final long DEFAULT_EXPIRATION_TIME = DAY_IN_MILLIS;
 
     /**
+     * Alert type
+     */
+    public enum AlertType {
+        CMAS_DEFAULT,
+        ETWS_DEFAULT,
+        EARTHQUAKE,
+        TSUNAMI,
+        AREA,
+        OTHER
+    }
+
+    /**
      *  Container for service category, serial number, location, body hash code, and ETWS primary/
      *  secondary information for duplication detection.
      */
@@ -364,15 +377,21 @@ public class CellBroadcastAlertService extends Service {
      */
     private boolean isMessageEnabledByUser(CellBroadcastMessage message) {
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         // Check if all emergency alerts are disabled.
-        boolean emergencyAlertEnabled = PreferenceManager.getDefaultSharedPreferences(this).
-                getBoolean(CellBroadcastSettings.KEY_ENABLE_EMERGENCY_ALERTS, true);
+        boolean emergencyAlertEnabled =
+                prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_EMERGENCY_ALERTS, true);
 
         // Check if ETWS/CMAS test message is forced to disabled on the device.
         boolean forceDisableEtwsCmasTest =
                 CellBroadcastSettings.isFeatureEnabled(this,
                         CarrierConfigManager.KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL, false);
 
+        boolean enableAreaUpdateInfoAlerts = Resources.getSystem().getBoolean(
+                com.android.internal.R.bool.config_showAreaUpdateInfoSettings)
+                && prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_AREA_UPDATE_INFO_ALERTS,
+                false);
+
         if (message.isEtwsTestMessage()) {
             return emergencyAlertEnabled &&
                     !forceDisableEtwsCmasTest &&
@@ -389,20 +408,6 @@ public class CellBroadcastAlertService extends Service {
 
         int channel = message.getServiceCategory();
 
-        if (channel == SmsCbConstants.MESSAGE_ID_GSMA_ALLOCATED_CHANNEL_50) {
-            // save latest area info broadcast for Settings display and send as broadcast
-            CellBroadcastReceiverApp.setLatestAreaInfo(message);
-            Intent intent = new Intent(CB_AREA_INFO_RECEIVED_ACTION);
-            intent.putExtra(EXTRA_MESSAGE, message);
-            // Send broadcast twice, once for apps that have PRIVILEGED permission and once
-            // for those that have the runtime one
-            sendBroadcastAsUser(intent, UserHandle.ALL,
-                    android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
-            sendBroadcastAsUser(intent, UserHandle.ALL,
-                    android.Manifest.permission.READ_PHONE_STATE);
-            return false;   // area info broadcasts are displayed in Settings status screen
-        }
-
         // Check if the messages are on additional channels enabled by the resource config.
         // If those channels are enabled by the carrier, but the device is actually roaming, we
         // should not allow the messages.
@@ -416,6 +421,27 @@ public class CellBroadcastAlertService extends Service {
                     if (isRoaming(message.getSubId())) {
                         return false;
                     }
+
+                    // The area update information cell broadcast should not cause any pop-up.
+                    // Instead the setting's app SIM status will show its information.
+                    if (range.mAlertType == AlertType.AREA) {
+                        if (enableAreaUpdateInfoAlerts) {
+                            // save latest area info broadcast for Settings display and send as
+                            // broadcast.
+                            CellBroadcastReceiverApp.setLatestAreaInfo(message);
+                            Intent intent = new Intent(CB_AREA_INFO_RECEIVED_ACTION);
+                            intent.setPackage(SETTINGS_APP);
+                            intent.putExtra(EXTRA_MESSAGE, message);
+                            // Send broadcast twice, once for apps that have PRIVILEGED permission
+                            // and once for those that have the runtime one.
+                            sendBroadcastAsUser(intent, UserHandle.ALL,
+                                    android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
+                            sendBroadcastAsUser(intent, UserHandle.ALL,
+                                    android.Manifest.permission.READ_PHONE_STATE);
+                            // area info broadcasts are displayed in Settings status screen
+                        }
+                        return false;
+                    }
                 }
             }
         }
@@ -470,12 +496,12 @@ public class CellBroadcastAlertService extends Service {
         audioIntent.setAction(CellBroadcastAlertAudio.ACTION_START_ALERT_AUDIO);
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
-        ToneType toneType = ToneType.CMAS_DEFAULT;
+        AlertType alertType = AlertType.CMAS_DEFAULT;
         if (message.isEtwsMessage()) {
             // For ETWS, always vibrate, even in silent mode.
             audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_VIBRATE_EXTRA, true);
             audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_ETWS_VIBRATE_EXTRA, true);
-            toneType = ToneType.ETWS_DEFAULT;
+            alertType = AlertType.ETWS_DEFAULT;
 
             if (message.getEtwsWarningInfo() != null) {
                 int warningType = message.getEtwsWarningInfo().getWarningType();
@@ -483,13 +509,13 @@ public class CellBroadcastAlertService extends Service {
                 switch (warningType) {
                     case SmsCbEtwsInfo.ETWS_WARNING_TYPE_EARTHQUAKE:
                     case SmsCbEtwsInfo.ETWS_WARNING_TYPE_EARTHQUAKE_AND_TSUNAMI:
-                        toneType = ToneType.EARTHQUAKE;
+                        alertType = AlertType.EARTHQUAKE;
                         break;
                     case SmsCbEtwsInfo.ETWS_WARNING_TYPE_TSUNAMI:
-                        toneType = ToneType.TSUNAMI;
+                        alertType = AlertType.TSUNAMI;
                         break;
                     case SmsCbEtwsInfo.ETWS_WARNING_TYPE_OTHER_EMERGENCY:
-                        toneType = ToneType.OTHER;
+                        alertType = AlertType.OTHER;
                         break;
                 }
             }
@@ -503,13 +529,13 @@ public class CellBroadcastAlertService extends Service {
             if (ranges != null) {
                 for (CellBroadcastChannelRange range : ranges) {
                     if (channel >= range.mStartId && channel <= range.mEndId) {
-                        toneType = range.mToneType;
+                        alertType = range.mAlertType;
                         break;
                     }
                 }
             }
         }
-        audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_TONE_TYPE, toneType);
+        audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_TONE_TYPE, alertType);
 
         String messageBody = message.getMessageBody();
 
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAreaInfoReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAreaInfoReceiver.java
index 709c0fc3b..d1a9a2df1 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAreaInfoReceiver.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAreaInfoReceiver.java
@@ -27,7 +27,7 @@ public class CellBroadcastAreaInfoReceiver extends BroadcastReceiver {
     private static final String TAG = "CBAreaInfoReceiver";
     static final boolean DBG = false;    // STOPSHIP: change to false before ship
     private static final String GET_LATEST_CB_AREA_INFO_ACTION =
-            "android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO";
+            "com.android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO";
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -40,6 +40,7 @@ public class CellBroadcastAreaInfoReceiver extends BroadcastReceiver {
             if (message != null) {
                 Intent areaInfoIntent = new Intent(
                         CellBroadcastAlertService.CB_AREA_INFO_RECEIVED_ACTION);
+                areaInfoIntent.setPackage(CellBroadcastAlertService.SETTINGS_APP);
                 areaInfoIntent.putExtra("message", message);
                 // Send broadcast twice, once for apps that have PRIVILEGED permission and once
                 // for those that have the runtime one
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java b/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
index 195f07bd6..aca35263c 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
@@ -19,14 +19,14 @@ package com.android.cellbroadcastreceiver;
 import android.content.Context;
 import android.util.Log;
 
-import com.android.cellbroadcastreceiver.CellBroadcastAlertAudio.ToneType;
+import com.android.cellbroadcastreceiver.CellBroadcastAlertService.AlertType;
 
 import java.util.ArrayList;
 
 /**
  * CellBroadcastChannelManager handles the additional cell broadcast channels that
  * carriers might enable through resources.
- * Syntax: "<channel id range>:[type=<tone type>], [emergency=true/false]"
+ * Syntax: "<channel id range>:[type=<alert type>], [emergency=true/false]"
  * For example,
  * <string-array name="additional_cbs_channels_strings" translatable="false">
  *     <item>"43008:type=earthquake, emergency=true"</item>
@@ -34,7 +34,7 @@ import java.util.ArrayList;
  *     <item>"0xAC00-0xAFED:type=other"</item>
  *     <item>"1234-5678"</item>
  * </string-array>
- * If no tones are specified, the tone type will be set to CMAS_DEFAULT. If emergency is not set,
+ * If no tones are specified, the alert type will be set to CMAS_DEFAULT. If emergency is not set,
  * by default it's not emergency.
  */
 public class CellBroadcastChannelManager {
@@ -45,7 +45,7 @@ public class CellBroadcastChannelManager {
 
     /**
      * Cell broadcast channel range
-     * A range is consisted by starting channel id, ending channel id, and the tone type
+     * A range is consisted by starting channel id, ending channel id, and the alert type
      */
     public static class CellBroadcastChannelRange {
 
@@ -54,17 +54,17 @@ public class CellBroadcastChannelManager {
 
         public int mStartId;
         public int mEndId;
-        public ToneType mToneType;
+        public AlertType mAlertType;
         public boolean mIsEmergency;
 
         public CellBroadcastChannelRange(String channelRange) throws Exception {
 
-            mToneType = ToneType.CMAS_DEFAULT;
+            mAlertType = AlertType.CMAS_DEFAULT;
             mIsEmergency = false;
 
             int colonIndex = channelRange.indexOf(':');
             if (colonIndex != -1) {
-                // Parse the tone type and emergency flag
+                // Parse the alert type and emergency flag
                 String[] pairs = channelRange.substring(colonIndex + 1).trim().split(",");
                 for (String pair : pairs) {
                     pair = pair.trim();
@@ -74,7 +74,7 @@ public class CellBroadcastChannelManager {
                         String value = tokens[1].trim();
                         switch (key) {
                             case KEY_TYPE:
-                                mToneType = ToneType.valueOf(value.toUpperCase());
+                                mAlertType = AlertType.valueOf(value.toUpperCase());
                                 break;
                             case KEY_EMERGENCY:
                                 mIsEmergency = value.equalsIgnoreCase("true");
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
index 12ba0ca96..1d68b927b 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
@@ -21,12 +21,14 @@ import static com.android.cellbroadcastreceiver.CellBroadcastReceiver.VDBG;
 import android.app.IntentService;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.preference.PreferenceManager;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SmsManager;
 import android.telephony.SubscriptionManager;
 import android.util.Log;
 
+import com.android.cellbroadcastreceiver.CellBroadcastAlertService.AlertType;
 import com.android.cellbroadcastreceiver.CellBroadcastChannelManager.CellBroadcastChannelRange;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.telephony.cdma.sms.SmsEnvelope;
@@ -159,6 +161,11 @@ public class CellBroadcastConfigService extends IntentService {
                 enableEmergencyAlerts &&
                 prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_CMAS_TEST_ALERTS, false);
 
+        boolean enableAreaUpdateInfoAlerts = Resources.getSystem().getBoolean(
+                com.android.internal.R.bool.config_showAreaUpdateInfoSettings)
+                && prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_AREA_UPDATE_INFO_ALERTS,
+                false);
+
         if (VDBG) {
             log("enableEmergencyAlerts = " + enableEmergencyAlerts);
             log("enableEtwsAlerts = " + enableEtwsAlerts);
@@ -169,6 +176,7 @@ public class CellBroadcastConfigService extends IntentService {
             log("forceDisableEtwsCmasTest = " + forceDisableEtwsCmasTest);
             log("enableEtwsTestAlerts = " + enableEtwsTestAlerts);
             log("enableCmasTestAlerts = " + enableCmasTestAlerts);
+            log("enableAreaUpdateInfoAlerts = " + enableAreaUpdateInfoAlerts);
         }
 
         /** Enable CDMA CMAS series messages. */
@@ -294,6 +302,10 @@ public class CellBroadcastConfigService extends IntentService {
 
         if (ranges != null) {
             for (CellBroadcastChannelRange range: ranges) {
+                if (range.mAlertType == AlertType.AREA && !enableAreaUpdateInfoAlerts) {
+                    // Skip area update info channels if it's not enabled.
+                    continue;
+                }
                 setCellBroadcastRange(manager, enableEmergencyAlerts,
                         SmsManager.CELL_BROADCAST_RAN_TYPE_GSM,
                         range.mStartId, range.mEndId);
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
index 7348135d2..9946ce97d 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
@@ -301,7 +301,7 @@ public class CellBroadcastResources {
                     if (cbm.getServiceCategory() >= range.mStartId &&
                             cbm.getServiceCategory() <= range.mEndId) {
                         // Apply the closest title to the specified tones.
-                        switch (range.mToneType) {
+                        switch (range.mAlertType) {
                             case CMAS_DEFAULT:
                                 return R.string.pws_other_message_identifiers;
                             case EARTHQUAKE:
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
index 5a17b2921..f26ec62be 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
@@ -28,19 +28,14 @@ import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
 import static android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS;
 import static android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS;
 
-import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.provider.SearchIndexableResource;
 import android.provider.SearchIndexablesProvider;
 import android.provider.Settings;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
 
 public class CellBroadcastSearchIndexableProvider extends SearchIndexablesProvider {
-    private static final String TAG = "CellBroadcastSearchIndexableProvider";
-
     private static SearchIndexableResource[] INDEXABLE_RES = new SearchIndexableResource[] {
             new SearchIndexableResource(1, R.xml.preferences,
                     CellBroadcastSettings.class.getName(),
@@ -129,21 +124,11 @@ public class CellBroadcastSearchIndexableProvider extends SearchIndexablesProvid
             cursor.addRow(ref);
         }
 
-        TelephonyManager tm = (TelephonyManager) getContext().getSystemService(
-                Context.TELEPHONY_SERVICE);
-
-        int subId = SubscriptionManager.getDefaultSmsSubscriptionId();
-        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
-            subId = SubscriptionManager.getDefaultSubscriptionId();
-        }
-
-        boolean enableChannel50Support = res.getBoolean(R.bool.show_brazil_settings) ||
-                "br".equals(tm.getSimCountryIso(subId));
-
-        if (!enableChannel50Support) {
+        if (!Resources.getSystem().getBoolean(
+                com.android.internal.R.bool.config_showAreaUpdateInfoSettings)) {
             ref = new Object[1];
             ref[COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE] =
-                    CellBroadcastSettings.KEY_ENABLE_CHANNEL_50_ALERTS;
+                    CellBroadcastSettings.KEY_ENABLE_AREA_UPDATE_INFO_ALERTS;
             cursor.addRow(ref);
         }
 
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
index 9a5032e5d..7a19febe7 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -34,7 +34,6 @@ import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
 import android.util.Log;
 
 /**
@@ -84,9 +83,10 @@ public class CellBroadcastSettings extends Activity {
     // Whether to display CMAS monthly test messages (default is disabled).
     public static final String KEY_ENABLE_CMAS_TEST_ALERTS = "enable_cmas_test_alerts";
 
-    // Preference key for whether to enable channel 50 notifications
-    // Enabled by default for phones sold in Brazil, otherwise this setting may be hidden.
-    public static final String KEY_ENABLE_CHANNEL_50_ALERTS = "enable_channel_50_alerts";
+    // Preference key for whether to enable area update information notifications
+    // Enabled by default for phones sold in Brazil and India, otherwise this setting may be hidden.
+    public static final String KEY_ENABLE_AREA_UPDATE_INFO_ALERTS =
+            "enable_area_update_info_alerts";
 
     // Preference key for initial opt-in/opt-out dialog.
     public static final String KEY_SHOW_CMAS_OPT_OUT_DIALOG = "show_cmas_opt_out_dialog";
@@ -97,9 +97,6 @@ public class CellBroadcastSettings extends Activity {
     // Preference key for emergency alerts history
     public static final String KEY_EMERGENCY_ALERT_HISTORY = "emergency_alert_history";
 
-    // Brazil country code
-    private static final String COUNTRY_BRAZIL = "br";
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -131,7 +128,7 @@ public class CellBroadcastSettings extends Activity {
         private TwoStatePreference mSpeechCheckBox;
         private TwoStatePreference mFullVolumeCheckBox;
         private TwoStatePreference mEtwsTestCheckBox;
-        private TwoStatePreference mChannel50CheckBox;
+        private TwoStatePreference mAreaUpdateInfoCheckBox;
         private TwoStatePreference mCmasTestCheckBox;
         private Preference mAlertHistory;
         private PreferenceCategory mAlertCategory;
@@ -162,8 +159,8 @@ public class CellBroadcastSettings extends Activity {
                     findPreference(KEY_USE_FULL_VOLUME);
             mEtwsTestCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_ETWS_TEST_ALERTS);
-            mChannel50CheckBox = (TwoStatePreference)
-                    findPreference(KEY_ENABLE_CHANNEL_50_ALERTS);
+            mAreaUpdateInfoCheckBox = (TwoStatePreference)
+                    findPreference(KEY_ENABLE_AREA_UPDATE_INFO_ALERTS);
             mCmasTestCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_CMAS_TEST_ALERTS);
             mAlertHistory = findPreference(KEY_EMERGENCY_ALERT_HISTORY);
@@ -254,31 +251,13 @@ public class CellBroadcastSettings extends Activity {
                 mAlertCategory.removePreference(mAmberCheckBox);
             }
 
-            TelephonyManager tm = (TelephonyManager) getContext().getSystemService(
-                    Context.TELEPHONY_SERVICE);
-
-            // We display channel 50 enable/disable menu if one of the followings is true
-            // 1. The setting through resource overlay is set to true.
-            // 2. At least one SIM inserted is Brazilian SIM.
-
-            boolean enableChannel50Support = res.getBoolean(R.bool.show_brazil_settings);
-
-            if (!enableChannel50Support) {
-                SubscriptionManager sm = SubscriptionManager.from(getContext());
-                for (int subId : sm.getActiveSubscriptionIdList()) {
-                    if (COUNTRY_BRAZIL.equals(tm.getSimCountryIso(subId))) {
-                        enableChannel50Support = true;
-                        break;
-                    }
-                }
-            }
-
-            if (!enableChannel50Support) {
-                mAlertCategory.removePreference(mChannel50CheckBox);
+            if (!Resources.getSystem().getBoolean(
+                    com.android.internal.R.bool.config_showAreaUpdateInfoSettings)) {
+                mAlertCategory.removePreference(mAreaUpdateInfoCheckBox);
             }
 
-            if (mChannel50CheckBox != null) {
-                mChannel50CheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
+            if (mAreaUpdateInfoCheckBox != null) {
+                mAreaUpdateInfoCheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
             }
             if (mEtwsTestCheckBox != null) {
                 mEtwsTestCheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
@@ -364,9 +343,9 @@ public class CellBroadcastSettings extends Activity {
                 mAmberCheckBox.setEnabled(alertsEnabled);
                 mAmberCheckBox.setChecked(alertsEnabled);
             }
-            if (mChannel50CheckBox != null) {
-                mChannel50CheckBox.setEnabled(alertsEnabled);
-                mChannel50CheckBox.setChecked(alertsEnabled);
+            if (mAreaUpdateInfoCheckBox != null) {
+                mAreaUpdateInfoCheckBox.setEnabled(alertsEnabled);
+                mAreaUpdateInfoCheckBox.setChecked(alertsEnabled);
             }
             if (mAlertPreferencesCategory != null) {
                 mAlertPreferencesCategory.setEnabled(alertsEnabled);
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastAlertServiceTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastAlertServiceTest.java
index c49eb271e..34bb59b0f 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastAlertServiceTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastAlertServiceTest.java
@@ -16,6 +16,13 @@
 
 package com.android.cellbroadcastreceiver;
 
+import static com.android.cellbroadcastreceiver.CellBroadcastAlertAudio.ALERT_AUDIO_TONE_TYPE;
+import static com.android.cellbroadcastreceiver.CellBroadcastAlertService.SHOW_NEW_ALERT_ACTION;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+
 import android.content.Intent;
 import android.os.PersistableBundle;
 import android.provider.Telephony;
@@ -25,7 +32,6 @@ import android.telephony.SmsCbCmasInfo;
 import android.telephony.SmsCbEtwsInfo;
 import android.telephony.SmsCbLocation;
 import android.telephony.SmsCbMessage;
-import android.util.Log;
 
 import com.android.internal.telephony.gsm.SmsCbConstants;
 
@@ -34,12 +40,6 @@ import org.junit.Before;
 
 import java.util.ArrayList;
 
-import static com.android.cellbroadcastreceiver.CellBroadcastAlertAudio.ALERT_AUDIO_TONE_TYPE;
-import static com.android.cellbroadcastreceiver.CellBroadcastAlertService.SHOW_NEW_ALERT_ACTION;
-import static org.junit.Assert.assertArrayEquals;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-
 public class CellBroadcastAlertServiceTest extends
         CellBroadcastServiceTestCase<CellBroadcastAlertService> {
 
@@ -134,7 +134,7 @@ public class CellBroadcastAlertServiceTest extends
         // verify audio service intent
         assertEquals(CellBroadcastAlertAudio.ACTION_START_ALERT_AUDIO,
                 mServiceIntentToVerify.getAction());
-        assertEquals(CellBroadcastAlertAudio.ToneType.CMAS_DEFAULT,
+        assertEquals(CellBroadcastAlertService.AlertType.CMAS_DEFAULT,
                 mServiceIntentToVerify.getSerializableExtra(ALERT_AUDIO_TONE_TYPE));
         assertEquals(message.getMessageBody(),
                 mServiceIntentToVerify.getStringExtra(
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManagerTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManagerTest.java
index 1a47b3876..264ee3da7 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManagerTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManagerTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.android.cellbroadcastreceiver.CellBroadcastAlertAudio.ToneType;
+import com.android.cellbroadcastreceiver.CellBroadcastAlertService.AlertType;
 import com.android.cellbroadcastreceiver.CellBroadcastChannelManager.CellBroadcastChannelRange;
 
 import org.junit.After;
@@ -65,27 +65,27 @@ public class CellBroadcastChannelManagerTest extends CellBroadcastTest {
 
         assertEquals(12, list.get(0).mStartId);
         assertEquals(12, list.get(0).mEndId);
-        assertEquals(ToneType.EARTHQUAKE, list.get(0).mToneType);
+        assertEquals(AlertType.EARTHQUAKE, list.get(0).mAlertType);
         assertTrue(list.get(0).mIsEmergency);
 
         assertEquals(456, list.get(1).mStartId);
         assertEquals(456, list.get(1).mEndId);
-        assertEquals(ToneType.TSUNAMI, list.get(1).mToneType);
+        assertEquals(AlertType.TSUNAMI, list.get(1).mAlertType);
         assertTrue(list.get(1).mIsEmergency);
 
         assertEquals(0xAC00, list.get(2).mStartId);
         assertEquals(0xAFED, list.get(2).mEndId);
-        assertEquals(ToneType.OTHER, list.get(2).mToneType);
+        assertEquals(AlertType.OTHER, list.get(2).mAlertType);
         assertFalse(list.get(2).mIsEmergency);
 
         assertEquals(54, list.get(3).mStartId);
         assertEquals(60, list.get(3).mEndId);
-        assertEquals(ToneType.CMAS_DEFAULT, list.get(3).mToneType);
+        assertEquals(AlertType.CMAS_DEFAULT, list.get(3).mAlertType);
         assertTrue(list.get(3).mIsEmergency);
 
         assertEquals(100, list.get(4).mStartId);
         assertEquals(200, list.get(4).mEndId);
-        assertEquals(ToneType.CMAS_DEFAULT, list.get(4).mToneType);
+        assertEquals(AlertType.CMAS_DEFAULT, list.get(4).mAlertType);
         assertFalse(list.get(4).mIsEmergency);
     }
 }