DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I306055cd845b7cdd538072e4ea301d064b8d3380
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 39e2f16..35d7305 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/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="hint_time_zone_search" msgid="804776560897143016">"Unesite ime države"</string>
-    <string name="searchview_description_clear" msgid="1603860069305867810">"Obriši upit"</string>
-    <string name="no_results_found" msgid="5475293015394772651">"Nije pronađen nijedan rezultat"</string>
+    <string name="searchview_description_clear" msgid="1603860069305867810">"Izbrisati upit"</string>
+    <string name="no_results_found" msgid="5475293015394772651">"Rezultati nisu pronađeni"</string>
     <string name="palestine_display_name" msgid="3485026339977302148">"Palestina"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 92026dc..87c5ed0 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/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="hint_time_zone_search" msgid="804776560897143016">"Angiv landenavn"</string>
+    <string name="hint_time_zone_search" msgid="804776560897143016">"Indtast landenavn"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Ryd forespørgslen"</string>
     <string name="no_results_found" msgid="5475293015394772651">"Der blev ikke fundet nogen resultater"</string>
     <string name="palestine_display_name" msgid="3485026339977302148">"Palæstina"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 61f3247..e1e6144 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -43,7 +43,7 @@
     <item msgid="2370319280810537375">"Brazília – Pará"</item>
   </string-array>
   <string-array name="backup_country_names">
-    <item msgid="9141777876082196578">"Svätý Martin (hol.)"</item>
+    <item msgid="9141777876082196578">"Sint Maarten"</item>
     <item msgid="5330962017221568054">"Karibské Holandsko"</item>
     <item msgid="1465164631761814300">"Curaçao"</item>
     <item msgid="8972081011408691260">"Južný Sudán"</item>