Snap for 10399941 from 7df90e9c3e102f0e20a87b7a3a43d05a2acc3a21 to sdk-releaseplatform-tools-34.0.5platform-tools-34.0.4

Change-Id: I6089d9dda2bacc34712b8384d250418a0f5ca0a5

17 files changed, 24 insertions, 22 deletions

diff --git a/EmergencyGestureAction/res/values-vi/strings.xml b/EmergencyGestureAction/res/values-vi/strings.xml
index 313227be..d1e001fc 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/res/values-am/strings.xml b/res/values-am/strings.xml
index 5d2d06e2..e0182c0b 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-de/strings.xml b/res/values-de/strings.xml
index 4c13643f..dfcbde4c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/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">"Notfallinformationen"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"Medizinische Informationen"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"Medizinische Daten"</string>
     <string name="add_medical_info" msgid="483921612415907139">"Informationen hinzufügen"</string>
     <string name="edit_info" msgid="5973929805855224805">"Notfallinformationen bearbeiten"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9e56ea28..dee93449 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-gl/strings.xml b/res/values-gl/strings.xml
index f9c10a17..40b31226 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_label" msgid="1090682794607161063">"Información de emerxencia"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Información médica"</string>
     <string name="add_medical_info" msgid="483921612415907139">"Engadir información"</string>
-    <string name="edit_info" msgid="5973929805855224805">"Editar información de emerxencia"</string>
+    <string name="edit_info" msgid="5973929805855224805">"Editar información para emerxencias"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Información"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
     <string name="name" msgid="4286267457738861977">"Nome"</string>
@@ -104,7 +104,7 @@
     <string name="clear" msgid="3648880442502887163">"Borrar"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Queres borrar toda a información e os contactos?"</string>
     <string name="emergency_info_footer" msgid="8751758742506410146">"Engadir contactos de emerxencia e información médica pode resultar útil para os servizos de emerxencias en caso dunha emerxencia.\n\nCalquera persoa pode ler esta información na túa pantalla de bloqueo e tocar os nomes dos contactos para marcar os seus números sen necesidade de desbloquear o teléfono."</string>
-    <string name="settings_suggestion_title" msgid="2503369576806243476">"Engadir información de emerxencia"</string>
+    <string name="settings_suggestion_title" msgid="2503369576806243476">"Engadir información para emerxencias"</string>
     <string name="settings_suggestion_body" msgid="5559349261345837716">"Permite que os servizos de emerxencias vexan os teus datos"</string>
     <string name="user_image_take_photo" msgid="2779924488370750102">"Tirar unha foto"</string>
     <string name="user_image_choose_photo" msgid="2442095378052415700">"Escoller unha imaxe"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 466d24e8..bbe543de 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-kk/strings.xml b/res/values-kk/strings.xml
index 5552ddef..47ea35f2 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 da41016f..8f7f8edc 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 b102c386..b1e17f7b 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 73a699a9..93798417 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/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>
@@ -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-pt/strings.xml b/res/values-pt/strings.xml
index 5e8410f0..d12e53da 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/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">"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>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b563c179..31f41295 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 4c9646fd..0fb20ad3 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 1dcbf5a6..051454df 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 75fa6393..f647ae90 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -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/tests/robolectric/Android.bp b/tests/robolectric/Android.bp
index 17d944eb..50350367 100644
--- a/tests/robolectric/Android.bp
+++ b/tests/robolectric/Android.bp
@@ -22,4 +22,5 @@ android_robolectric_test {
     java_resource_dirs: ["config"],
     static_libs: ["emergencyinfo-test-common"],
     instrumentation_for: "EmergencyInfo",
+    upstream: true,
 }
diff --git a/tests/robolectric/config/robolectric.properties b/tests/robolectric/config/robolectric.properties
index fab7251d..2a9e50df 100644
--- a/tests/robolectric/config/robolectric.properties
+++ b/tests/robolectric/config/robolectric.properties
@@ -1 +1,2 @@
 sdk=NEWEST_SDK
+instrumentedPackages=androidx.preference