diff --git a/EmergencyGestureAction/AndroidManifest.xml b/EmergencyGestureAction/AndroidManifest.xml
index 87b8a28..33219e9 100644
--- a/EmergencyGestureAction/AndroidManifest.xml
+++ b/EmergencyGestureAction/AndroidManifest.xml
@@ -18,7 +18,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.emergency">
+    package="com.android.emergency.action">
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
diff --git a/EmergencyGestureAction/res/values-vi/strings.xml b/EmergencyGestureAction/res/values-vi/strings.xml
index 313227b..d1e001f 100644
--- a/EmergencyGestureAction/res/values-vi/strings.xml
+++ b/EmergencyGestureAction/res/values-vi/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cancel" msgid="1942863792086990604">"Hủy"</string>
-    <string name="emergency_action_title" msgid="4329795972111990414">"Khẩn cấp"</string>
+    <string name="emergency_action_title" msgid="4329795972111990414">"SOS khẩn cấp"</string>
     <string name="emergency_action_subtitle" msgid="5667616628096114616">"Đang chuẩn bị gọi đến <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
     <string name="count_down_unit" msgid="7461042666268976220">"giây"</string>
     <string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 giây}other{# giây}}"</string>
diff --git a/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionActivity.java b/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionActivity.java
index 34a31b1..fee7669 100644
--- a/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionActivity.java
+++ b/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionActivity.java
@@ -28,7 +28,7 @@
 import android.view.WindowInsetsController;
 
 import com.android.emergency.action.EmergencyActionUtils;
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 /**
  * Activity for handling emergency action.
diff --git a/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionFragment.java b/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionFragment.java
index c191ab2..02415df 100644
--- a/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionFragment.java
+++ b/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionFragment.java
@@ -33,7 +33,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.emergency.R;
 import com.android.emergency.action.broadcast.EmergencyActionBroadcastReceiver;
 import com.android.emergency.action.sensoryfeedback.EmergencyActionAlarmHelper;
 import com.android.emergency.action.service.EmergencyActionForegroundService;
diff --git a/EmergencyGestureAction/src/com/android/emergency/action/sensoryfeedback/EmergencyActionAlarmHelper.java b/EmergencyGestureAction/src/com/android/emergency/action/sensoryfeedback/EmergencyActionAlarmHelper.java
index 6404326..9d877e0 100644
--- a/EmergencyGestureAction/src/com/android/emergency/action/sensoryfeedback/EmergencyActionAlarmHelper.java
+++ b/EmergencyGestureAction/src/com/android/emergency/action/sensoryfeedback/EmergencyActionAlarmHelper.java
@@ -24,7 +24,7 @@
 import android.util.Log;
 
 import com.android.emergency.action.EmergencyActionUtils;
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 
 public class EmergencyActionAlarmHelper {
diff --git a/EmergencyGestureAction/src/com/android/emergency/action/service/EmergencyActionForegroundService.java b/EmergencyGestureAction/src/com/android/emergency/action/service/EmergencyActionForegroundService.java
index 274d324..4394428 100644
--- a/EmergencyGestureAction/src/com/android/emergency/action/service/EmergencyActionForegroundService.java
+++ b/EmergencyGestureAction/src/com/android/emergency/action/service/EmergencyActionForegroundService.java
@@ -35,7 +35,7 @@
 import android.util.Log;
 import android.widget.RemoteViews;
 
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 import com.android.emergency.action.broadcast.EmergencyActionBroadcastReceiver;
 import com.android.emergency.action.sensoryfeedback.EmergencyActionAlarmHelper;
 import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
diff --git a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownAnimationView.java b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownAnimationView.java
index ae16437..c437570 100644
--- a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownAnimationView.java
+++ b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownAnimationView.java
@@ -25,7 +25,7 @@
 
 import androidx.annotation.UiThread;
 
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 import com.google.common.util.concurrent.Uninterruptibles;
 
diff --git a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownRenderer.java b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownRenderer.java
index a474255..6bb301b 100644
--- a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownRenderer.java
+++ b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownRenderer.java
@@ -26,7 +26,7 @@
 
 import androidx.annotation.GuardedBy;
 
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 import java.time.Duration;
 
diff --git a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/LoopingAnimationThread.java b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/LoopingAnimationThread.java
index 33ebed7..47cc8e5 100644
--- a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/LoopingAnimationThread.java
+++ b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/LoopingAnimationThread.java
@@ -29,7 +29,7 @@
 
 import androidx.annotation.GuardedBy;
 
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -236,4 +236,4 @@
     void stopDrawing() {
         mIsDrawing = false;
     }
-}
\ No newline at end of file
+}
diff --git a/EmergencyGestureAction/src/com/android/emergency/widgets/slider/SliderView.java b/EmergencyGestureAction/src/com/android/emergency/widgets/slider/SliderView.java
index 03310ae..e154459 100644
--- a/EmergencyGestureAction/src/com/android/emergency/widgets/slider/SliderView.java
+++ b/EmergencyGestureAction/src/com/android/emergency/widgets/slider/SliderView.java
@@ -24,7 +24,7 @@
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 /**
  * A slider button. User can slide the thumb/scrim from one end to the other end to activate the
@@ -105,4 +105,4 @@
     @Override
     public void onStopTrackingTouch(SeekBar seekBar) {
     }
-}
\ No newline at end of file
+}
diff --git a/EmergencyGestureContentProvider/AndroidManifest.xml b/EmergencyGestureContentProvider/AndroidManifest.xml
index 8437c51..d17e847 100644
--- a/EmergencyGestureContentProvider/AndroidManifest.xml
+++ b/EmergencyGestureContentProvider/AndroidManifest.xml
@@ -16,6 +16,6 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.emergency">
+          package="com.android.emergency.contentprovider">
 
 </manifest>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 5d2d06e..e0182c0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -31,7 +31,7 @@
     <string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
     <string name="age" msgid="8327537794752630199">"ዕድሜ፦ <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
     <string name="remove_dob_icon_text" msgid="4413507180967999944">"የልደት ቀን ያስወግዱ"</string>
-    <string name="blood_type" msgid="6947022772999974608">"የደም አይነት"</string>
+    <string name="blood_type" msgid="6947022772999974608">"የደም ዓይነት"</string>
     <string name="unknown_blood_type" msgid="6337228278125085668">"ያልታወቀ"</string>
     <string name="oplus" msgid="7759756742377867011">"ኦ+"</string>
     <string name="ominus" msgid="5227278501191741055">"ኦ-"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"ሁሉንም አጽዳ"</string>
     <string name="clear" msgid="3648880442502887163">"አጽዳ"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"ሁሉንም መረጃ እና እውቂያዎች ይጸዱ?"</string>
-    <string name="emergency_info_footer" msgid="8751758742506410146">"የሕክምና መረጃ እና የድንገተኛ አደጋ ጊዜ ተጠሪን ማከል በድንገተኛ አደጋ ጊዜ ላይ መጀመሪያ ለሚደርሱ ሰዎች ሊያግዛቸው ይችላል።\n\nማንኛውም ሰው የእርስዎን ስልክ ሳይከፍት ይህን መረጃ ከማያ ገጽ ቁልፍዎ ማንበብ እና ስማቸውን እውቂያዎችዎን መታ በማድረግ ሊደውልላቸው ይችላል።"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"የሕክምና መረጃ እና የድንገተኛ አደጋ ጊዜ ተጠሪን ማከል በድንገተኛ አደጋ ጊዜ ላይ መጀመሪያ ለሚደርሱ ሰዎች ሊያግዛቸው ይችላል።\n\nማንኛውም ሰው የእርስዎን ስልክ ሳይከፍት ይህን መረጃ ከማያ ገፅ ቁልፍዎ ማንበብ እና ስማቸውን እውቂያዎችዎን መታ በማድረግ ሊደውልላቸው ይችላል።"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"የድንገተኛ አደጋ ጊዜ ተጠሪ መረጃን ያክሉ"</string>
     <string name="settings_suggestion_body" msgid="5559349261345837716">"የመጀመሪያ ደረጃ ምላሽ ሰጪዎች መረጃዎን ይመልከቱ"</string>
     <string name="user_image_take_photo" msgid="2779924488370750102">"ፎቶ ያንሱ"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8d4d688..933289e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1090682794607161063">"Info til nødsituationer"</string>
+    <string name="app_label" msgid="1090682794607161063">"Nødoplysninger"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Helbredsoplysninger"</string>
     <string name="add_medical_info" msgid="483921612415907139">"Tilføj oplysninger"</string>
-    <string name="edit_info" msgid="5973929805855224805">"Rediger info til nødsituationer"</string>
+    <string name="edit_info" msgid="5973929805855224805">"Rediger nødoplysninger"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakter"</string>
     <string name="name" msgid="4286267457738861977">"Navn"</string>
@@ -87,7 +87,7 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"Kontaktpersoner ved nødsituationer"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"Nødkontakter"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"Tilføj kontakt"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"Der blev ikke fundet en kontaktpersonvælger"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Kontaktpersonen kan ikke vises"</string>
@@ -104,7 +104,7 @@
     <string name="clear" msgid="3648880442502887163">"Ryd"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Vil du rydde alle oplysninger og kontakter?"</string>
     <string name="emergency_info_footer" msgid="8751758742506410146">"Hvis du tilføjer helbredsoplysninger og kontakter til brug i nødsituationer, kan det hjælpe førstehjælpsydere i en nødsituation.\n\nAlle kan få adgang til disse oplysninger på din låseskærm og ringe til dine kontakter ved at trykke på deres navne uden at låse telefonen op."</string>
-    <string name="settings_suggestion_title" msgid="2503369576806243476">"Tilføj info til nødsituationer"</string>
+    <string name="settings_suggestion_title" msgid="2503369576806243476">"Tilføj nødoplysninger"</string>
     <string name="settings_suggestion_body" msgid="5559349261345837716">"Lad førstehjælpsydere se dine oplysninger"</string>
     <string name="user_image_take_photo" msgid="2779924488370750102">"Tag et billede"</string>
     <string name="user_image_choose_photo" msgid="2442095378052415700">"Vælg et billede"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index dfcbde4..9f7d34d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -77,7 +77,7 @@
     <string name="medications" msgid="644428945685557183">"Medikamente"</string>
     <string name="unknown_medications" msgid="2764171064510423734">"Unbekannt"</string>
     <string name="medications_hint" msgid="3221620025945593723">"Beispiel: Aspirin"</string>
-    <string name="medical_conditions" msgid="3555690011498283592">"Medizinische Informationen"</string>
+    <string name="medical_conditions" msgid="3555690011498283592">"Medizinische Daten"</string>
     <string name="unknown_medical_conditions" msgid="8051364895172053770">"Unbekannt"</string>
     <string name="medical_conditions_hint" msgid="6959152183029062882">"Beispiel: Asthma"</string>
     <string name="organ_donor" msgid="5953509460007124827">"Organspender"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index ae10b6b..4a1428f 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -26,11 +26,11 @@
     <string name="unknown_name" msgid="2834802479170495056">"Ezezaguna"</string>
     <string name="address" msgid="6449303483151189969">"Helbidea"</string>
     <string name="unknown_address" msgid="4212576729941786121">"Ezezaguna"</string>
-    <string name="date_of_birth" msgid="777979232444227891">"Jaiotze-data"</string>
+    <string name="date_of_birth" msgid="777979232444227891">"Jaiotza-data"</string>
     <string name="unknown_date_of_birth" msgid="7416355536916066758">"Ezezaguna"</string>
     <string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
     <string name="age" msgid="8327537794752630199">"Adina: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
-    <string name="remove_dob_icon_text" msgid="4413507180967999944">"Kendu jaiotze-data"</string>
+    <string name="remove_dob_icon_text" msgid="4413507180967999944">"Kendu jaiotza-data"</string>
     <string name="blood_type" msgid="6947022772999974608">"Odol taldea"</string>
     <string name="unknown_blood_type" msgid="6337228278125085668">"Ezezaguna"</string>
     <string name="oplus" msgid="7759756742377867011">"O+"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1285cb7..ae59ed5 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Données d\'urgence"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"Données médicales"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"Informations médicales"</string>
     <string name="add_medical_info" msgid="483921612415907139">"Ajouter des renseignements"</string>
     <string name="edit_info" msgid="5973929805855224805">"Modifier les données d\'urgence"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Information"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9e56ea2..dee9344 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -77,7 +77,7 @@
     <string name="medications" msgid="644428945685557183">"Traitements médicamenteux"</string>
     <string name="unknown_medications" msgid="2764171064510423734">"Inconnus"</string>
     <string name="medications_hint" msgid="3221620025945593723">"Par exemple, aspirine"</string>
-    <string name="medical_conditions" msgid="3555690011498283592">"Autres informations médicales"</string>
+    <string name="medical_conditions" msgid="3555690011498283592">"Maladies"</string>
     <string name="unknown_medical_conditions" msgid="8051364895172053770">"Inconnues"</string>
     <string name="medical_conditions_hint" msgid="6959152183029062882">"Par exemple, asthme"</string>
     <string name="organ_donor" msgid="5953509460007124827">"Donneur d\'organes"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 466d24e..bbe543d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -77,7 +77,7 @@
     <string name="medications" msgid="644428945685557183">"दवाएं"</string>
     <string name="unknown_medications" msgid="2764171064510423734">"अज्ञात"</string>
     <string name="medications_hint" msgid="3221620025945593723">"उदाहरण के लिए, एस्पिरिन"</string>
-    <string name="medical_conditions" msgid="3555690011498283592">"इलाज से जुड़ी कुछ बातें"</string>
+    <string name="medical_conditions" msgid="3555690011498283592">"स्वास्थ्य से जुड़ी कुछ बातें"</string>
     <string name="unknown_medical_conditions" msgid="8051364895172053770">"अज्ञात"</string>
     <string name="medical_conditions_hint" msgid="6959152183029062882">"उदाहरण के लिए, दमा"</string>
     <string name="organ_donor" msgid="5953509460007124827">"अंग दान करने वाला"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 81d9b74..63be87b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1090682794607161063">"Informazioni per le emergenze"</string>
+    <string name="app_label" msgid="1090682794607161063">"Informazioni d\'emergenza"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Informazioni mediche"</string>
     <string name="add_medical_info" msgid="483921612415907139">"Aggiungi informazioni"</string>
     <string name="edit_info" msgid="5973929805855224805">"Modifica informazioni per le emergenze"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 5552dde..47ea35f 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -100,7 +100,7 @@
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Телефон иесі туралы ақпарат жоқ"</string>
     <string name="tap_pencil" msgid="3429817710241457947">"Телефон құлпы ашылғанда, қарындаш белгішесін түрту арқылы төтенше жағдай кезінде осы жерде көрсетілетін ақпаратты қосыңыз."</string>
-    <string name="clear_all" msgid="8899013032870561633">"Барлығын тазалау"</string>
+    <string name="clear_all" msgid="8899013032870561633">"Барлығын тазарту"</string>
     <string name="clear" msgid="3648880442502887163">"Тазалау"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Бүкіл ақпаратты және контактілерді тазалау керек пе?"</string>
     <string name="emergency_info_footer" msgid="8751758742506410146">"Медициналық ақпарат пен төтенше жағдай контактілері алғашқы жәрдем берушілерге көмектеседі.\n\nБұл ақпаратты кез келген адам құлыптау экранынан оқи алады және телефон құлпын ашпастан аттарды түрте отырып, контактілерге хабарласа алады."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index da41016..8f7f8ed 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -88,7 +88,7 @@
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
     <string name="emergency_contacts_title" msgid="5462202017417821030">"Контакти за итни случаи"</string>
-    <string name="add_emergency_contact" msgid="4063577069613981029">"Додај контакт"</string>
+    <string name="add_emergency_contact" msgid="4063577069613981029">"Додајте контакт"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"Не може да се најде избирач на контакти"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Не може да се прикаже контактот"</string>
     <string name="remove_contact" msgid="6934983445723096759">"Да се отстрани <xliff:g id="CONTACT_NAME">%1$s</xliff:g> од контактите за итни случаи?"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index b102c38..b1e17f7 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -80,7 +80,7 @@
     <string name="medical_conditions" msgid="3555690011498283592">"Эрүүл мэндийн тэмдэглэл"</string>
     <string name="unknown_medical_conditions" msgid="8051364895172053770">"Тодорхойгүй"</string>
     <string name="medical_conditions_hint" msgid="6959152183029062882">"Жишээ нь: багтраа"</string>
-    <string name="organ_donor" msgid="5953509460007124827">"Донор эрхтэн"</string>
+    <string name="organ_donor" msgid="5953509460007124827">"Эрхтэний донор"</string>
     <string name="unknown_organ_donor" msgid="2780515342875494225">"Тодорхойгүй"</string>
     <string name="yes" msgid="5829765567799916128">"Тийм"</string>
     <string name="no" msgid="1681689233660683509">"Үгүй"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 1234c25..a2433ca 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -21,7 +21,7 @@
     <string name="add_medical_info" msgid="483921612415907139">"जानकारी थप्नुहोस्"</string>
     <string name="edit_info" msgid="5973929805855224805">"आपत्‌कालीन जानकारीलाई सम्पादन गर्नुहोस्"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"जानकारी"</string>
-    <string name="tab_title_contacts" msgid="4298341166404791209">"सम्पर्कहरू"</string>
+    <string name="tab_title_contacts" msgid="4298341166404791209">"कन्ट्याक्टहरू"</string>
     <string name="name" msgid="4286267457738861977">"नाम"</string>
     <string name="unknown_name" msgid="2834802479170495056">"अज्ञात"</string>
     <string name="address" msgid="6449303483151189969">"ठेगाना"</string>
@@ -87,7 +87,7 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"आपत्‌कालीन सम्पर्कहरू"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"आपत्‌कालीन कन्ट्याक्टहरू"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"कन्ट्याक्ट हाल्नुहोस्"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"सम्पर्क ठेगानाहरूको चयनकर्ता भेट्टाउन सकिएन"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"उक्त सम्पर्क देखाउन सकिँदैन"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c688a24..55bed60 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -102,7 +102,7 @@
     <string name="tap_pencil" msgid="3429817710241457947">"Com o telemóvel desbloqueado, toque no ícone de lápis para adicionar informações que são apresentadas aqui em caso de emergência"</string>
     <string name="clear_all" msgid="8899013032870561633">"Limpar tudo"</string>
     <string name="clear" msgid="3648880442502887163">"Limpar"</string>
-    <string name="clear_all_message" msgid="1548432000373861295">"Pretende limpar todas as informações e contactos?"</string>
+    <string name="clear_all_message" msgid="1548432000373861295">"Quer limpar todas as informações e contactos?"</string>
     <string name="emergency_info_footer" msgid="8751758742506410146">"Adicionar informações médicas e contactos de emergência pode ajudar os socorristas numa situação de emergência.\n\nQualquer pessoa pode ler estas informações no ecrã de bloqueio e marcar os números dos seus contactos ao tocar nos respetivos nomes sem desbloquear o telemóvel."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Adicionar informações de emergência"</string>
     <string name="settings_suggestion_body" msgid="5559349261345837716">"Permita que os socorristas vejam as suas informações."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5e8410f..1e51d01 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informações de emergência"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"Informações médicas"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"Informações de saúde"</string>
     <string name="add_medical_info" msgid="483921612415907139">"Adicionar informações"</string>
     <string name="edit_info" msgid="5973929805855224805">"Edita as informações de emergência"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informações"</string>
@@ -100,10 +100,10 @@
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Nenhuma informação sobre o proprietário do smartphone"</string>
     <string name="tap_pencil" msgid="3429817710241457947">"Com o smartphone desbloqueado, toque no ícone de lápis para adicionar as informações que vão aparecer aqui em caso de emergência"</string>
-    <string name="clear_all" msgid="8899013032870561633">"Limpar tudo"</string>
+    <string name="clear_all" msgid="8899013032870561633">"Remover tudo"</string>
     <string name="clear" msgid="3648880442502887163">"Limpar"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Limpar todas as informações e contatos?"</string>
-    <string name="emergency_info_footer" msgid="8751758742506410146">"Adicionar informações médicas e contatos de emergência pode ajudar os socorristas em uma emergência.\n\nQualquer pessoa pode ler essas informações na tela de bloqueio e ligar para seus contatos tocando no nome deles sem desbloquear o smartphone."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Adicionar informações de saúde e contatos de emergência pode ajudar os socorristas em uma emergência.\n\nQualquer pessoa pode ler essas informações na tela de bloqueio e ligar para seus contatos tocando no nome deles sem desbloquear o smartphone."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Adicionar informações de emergência"</string>
     <string name="settings_suggestion_body" msgid="5559349261345837716">"Permita que os socorristas vejam suas informações"</string>
     <string name="user_image_take_photo" msgid="2779924488370750102">"Tirar uma foto"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b563c17..31f4129 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -87,7 +87,7 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"รายชื่อติดต่อกรณีฉุกเฉิน"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"ผู้ติดต่อกรณีฉุกเฉิน"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"เพิ่มรายชื่อติดต่อ"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"ไม่พบเครื่องมือเลือกรายชื่อติดต่อ"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"ไม่สามารถแสดงรายชื่อติดต่อ"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4c9646f..0fb20ad 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -87,7 +87,7 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"Acil durumda iletişim kurulacak kişiler"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"Acil durumda iletişime geçilecek kişiler"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"Kişi ekle"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"Kişi seçici bulunamadı"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Kişi görüntülenemiyor"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 1dcbf5a..051454d 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1090682794607161063">"ہنگامی معلومات"</string>
+    <string name="app_label" msgid="1090682794607161063">"ایمرجنسی معلومات"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"طبی معلومات"</string>
     <string name="add_medical_info" msgid="483921612415907139">"معلومات شامل کریں"</string>
-    <string name="edit_info" msgid="5973929805855224805">"ہنگامی معلومات میں ترمیم کریں"</string>
+    <string name="edit_info" msgid="5973929805855224805">"ایمرجنسی معلومات میں ترمیم کریں"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"معلومات"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"رابطے"</string>
     <string name="name" msgid="4286267457738861977">"نام"</string>
@@ -91,7 +91,7 @@
     <string name="add_emergency_contact" msgid="4063577069613981029">"رابطہ شامل کریں"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"رابطہ منتخب کنندہ کو تلاش نہیں کیا جا سکا"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"رابطہ کو ڈسپلے نہیں کر سکتے"</string>
-    <string name="remove_contact" msgid="6934983445723096759">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> کو ہنگامی رابطوں سے ہٹائیں؟"</string>
+    <string name="remove_contact" msgid="6934983445723096759">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> کو ایمرجنسی رابطوں سے ہٹائیں؟"</string>
     <string name="remove_contact_icon_text" msgid="4576641386490101363">"رابطہ ہٹائیں"</string>
     <string name="fail_add_contact" msgid="6511490846952942291">"رابطے کی معلومات اچھی طرح پڑھنے سے قاصر"</string>
     <string name="remove" msgid="1243949503772376064">"ہٹائیں"</string>
@@ -104,7 +104,7 @@
     <string name="clear" msgid="3648880442502887163">"صاف کریں"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"تمام معلومات اور رابطے صاف کریں؟"</string>
     <string name="emergency_info_footer" msgid="8751758742506410146">"طبی معلومات اور ایمرجینسی رابطے شامل کرنے سے ایمرجینسی حالت میں پہلے جواب دہندگان کو مدد مل سکتی ہے۔\n\nآپ کے فون کو غیر مقفل کیے بغیر کوئی بھی شخص آپ کی لاک اسکرین سے یہ معلومعات پڑھ سکتا ہے اور رابطوں کے ناموں پر تھپتھپا کر انہیں ڈائل کر سکتا ہے۔"</string>
-    <string name="settings_suggestion_title" msgid="2503369576806243476">"ہنگامی معلومات شامل کریں"</string>
+    <string name="settings_suggestion_title" msgid="2503369576806243476">"ایمرجنسی معلومات شامل کریں"</string>
     <string name="settings_suggestion_body" msgid="5559349261345837716">"اولین جواب دہندگان کو اپنی معلومات دیکھنے کی سہولت دیں"</string>
     <string name="user_image_take_photo" msgid="2779924488370750102">"ایک تصویر لیں"</string>
     <string name="user_image_choose_photo" msgid="2442095378052415700">"ایک تصویر منتخب کریں"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 75fa639..0a7833f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"緊急資料"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"醫療資訊"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"醫療資料"</string>
     <string name="add_medical_info" msgid="483921612415907139">"新增資訊"</string>
     <string name="edit_info" msgid="5973929805855224805">"編輯緊急資料"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"資訊"</string>
@@ -103,9 +103,9 @@
     <string name="clear_all" msgid="8899013032870561633">"全部清除"</string>
     <string name="clear" msgid="3648880442502887163">"清除"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"要清除所有資料和聯絡人嗎？"</string>
-    <string name="emergency_info_footer" msgid="8751758742506410146">"新増醫療資訊和緊急聯絡人可以協助先遣急救員處理緊急情況。\n\n在您的手機未解鎖的情況下，任何人都能在上鎖畫面中查看這些資料，並透過輕按緊急聯絡人姓名來撥打對方的號碼。"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"新増醫療資料和緊急聯絡人可以協助先遣急救員處理緊急情況。\n\n在你的手機未解鎖的情況下，任何人都能在上鎖畫面中查看這些資料，並透過輕按緊急聯絡人姓名來撥打對方的號碼。"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"新增緊急資料"</string>
-    <string name="settings_suggestion_body" msgid="5559349261345837716">"讓先遣急救員查看您的資料"</string>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"讓先遣急救員查看你的資料"</string>
     <string name="user_image_take_photo" msgid="2779924488370750102">"拍攝相片"</string>
     <string name="user_image_choose_photo" msgid="2442095378052415700">"選擇圖片"</string>
     <string name="user_image_photo_selector" msgid="8941966433899876760">"揀相"</string>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 56dbc50..5181720 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -17,7 +17,7 @@
     <declare-styleable name="EmergencyEditTextPreference">
         <!-- Summary text for the text preference. This is used rather than android:summary to
         avoid indexing the text incorrectly during settings search. -->
-        <attr name="summary" />
+        <attr name="summary" format="string" />
     </declare-styleable>
 
     <declare-styleable name="EmergencyListPreference">
diff --git a/src/com/android/emergency/preferences/EmergencyNamePreference.java b/src/com/android/emergency/preferences/EmergencyNamePreference.java
index b6a754f..a2bc124 100644
--- a/src/com/android/emergency/preferences/EmergencyNamePreference.java
+++ b/src/com/android/emergency/preferences/EmergencyNamePreference.java
@@ -69,7 +69,7 @@
     }
 
     public EmergencyNamePreference(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.dialogPreferenceStyle);
+        this(context, attrs, androidx.preference.R.attr.dialogPreferenceStyle);
     }
 
     public EmergencyNamePreference(Context context) {