diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index 5396742..6fdf6a3 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -86,7 +86,7 @@
     <string name="gesture_space_aware" msgid="2078291600664682496">"Glidende mellemrum"</string>
     <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Tilføj mellemrum ved at glide til mellemrumstasten"</string>
     <string name="voice_input" msgid="3583258583521397548">"Knap til indtaling"</string>
-    <string name="voice_input_disabled_summary" msgid="6323489602945135165">"Der er ingen aktiverede indtalingsmetoder. Kontrollér indstillingerne for sprog og indtastning."</string>
+    <string name="voice_input_disabled_summary" msgid="6323489602945135165">"Der er ingen aktiverede indtalingsmetoder. Tjek indstillingerne for sprog og indtastning."</string>
     <string name="configure_input_method" msgid="373356270290742459">"Konfigurer inputmetoder"</string>
     <string name="language_selection_title" msgid="3666971864764478269">"Sprog"</string>
     <string name="help_and_feedback" msgid="5328219371839879161">"Hjælp og feedback"</string>
diff --git a/java/res/values-et/strings-emoji-descriptions.xml b/java/res/values-et/strings-emoji-descriptions.xml
index 8556446..0bd3707 100644
--- a/java/res/values-et/strings-emoji-descriptions.xml
+++ b/java/res/values-et/strings-emoji-descriptions.xml
@@ -777,7 +777,7 @@
     <string name="spoken_emoji_1F4C7" msgid="2665313547987324495">"Kaardiregister"</string>
     <string name="spoken_emoji_1F4C8" msgid="8007686702282833600">"Tõusva trendiga diagramm"</string>
     <string name="spoken_emoji_1F4C9" msgid="2271951411192893684">"Langeva trendiga diagramm"</string>
-    <string name="spoken_emoji_1F4CA" msgid="3525692829622381444">"Tulpdiagramm"</string>
+    <string name="spoken_emoji_1F4CA" msgid="3525692829622381444">"Lintdiagramm"</string>
     <string name="spoken_emoji_1F4CB" msgid="977639227554095521">"Kirjutusalus"</string>
     <string name="spoken_emoji_1F4CC" msgid="156107396088741574">"Knopka"</string>
     <string name="spoken_emoji_1F4CD" msgid="4266572175361190231">"Ümara peaga knopka"</string>
diff --git a/java/res/values-fa/strings-emoji-descriptions.xml b/java/res/values-fa/strings-emoji-descriptions.xml
index 884c3ff..747bf1a 100644
--- a/java/res/values-fa/strings-emoji-descriptions.xml
+++ b/java/res/values-fa/strings-emoji-descriptions.xml
@@ -746,7 +746,7 @@
     <string name="spoken_emoji_1F4A8" msgid="4472108229720006377">"نماد خط تیره"</string>
     <string name="spoken_emoji_1F4A9" msgid="1240958472788430032">"توده مدفوع"</string>
     <string name="spoken_emoji_1F4AA" msgid="8427525538635146416">"بازوی پهلوانی"</string>
-    <string name="spoken_emoji_1F4AB" msgid="5484114759939427459">"نماد سرگیجه"</string>
+    <string name="spoken_emoji_1F4AB" msgid="5484114759939427459">"نماد گیجی"</string>
     <string name="spoken_emoji_1F4AC" msgid="5571196638219612682">"بالون گفتگو"</string>
     <string name="spoken_emoji_1F4AD" msgid="353174619257798652">"بالون تفکر"</string>
     <string name="spoken_emoji_1F4AE" msgid="1223142786927162641">"گل سفید"</string>
diff --git a/java/res/values-in/strings-emoji-descriptions.xml b/java/res/values-in/strings-emoji-descriptions.xml
index dffa183..0f51355 100644
--- a/java/res/values-in/strings-emoji-descriptions.xml
+++ b/java/res/values-in/strings-emoji-descriptions.xml
@@ -809,11 +809,11 @@
     <string name="spoken_emoji_1F4E7" msgid="5557136988503873238">"Simbol email"</string>
     <string name="spoken_emoji_1F4E8" msgid="30698793974124123">"Amplop yang masuk"</string>
     <string name="spoken_emoji_1F4E9" msgid="5947550337678643166">"Amplop dengan panah ke bawah di atas"</string>
-    <string name="spoken_emoji_1F4EA" msgid="772614045207213751">"Kotak pos tertutup dengan bendera turun"</string>
-    <string name="spoken_emoji_1F4EB" msgid="6491414165464146137">"Kotak pos tertutup dengan bendera terangkat"</string>
-    <string name="spoken_emoji_1F4EC" msgid="7369517138779988438">"Kotak pos terbuka dengan bendera terangkat"</string>
-    <string name="spoken_emoji_1F4ED" msgid="5657520436285454241">"Kotak pos terbuka dengan bendera turun"</string>
-    <string name="spoken_emoji_1F4EE" msgid="8464138906243608614">"Kotak pos"</string>
+    <string name="spoken_emoji_1F4EA" msgid="772614045207213751">"Kotak postingan tertutup dengan bendera turun"</string>
+    <string name="spoken_emoji_1F4EB" msgid="6491414165464146137">"Kotak postingan tertutup dengan bendera terangkat"</string>
+    <string name="spoken_emoji_1F4EC" msgid="7369517138779988438">"Kotak postingan terbuka dengan bendera terangkat"</string>
+    <string name="spoken_emoji_1F4ED" msgid="5657520436285454241">"Kotak postingan terbuka dengan bendera turun"</string>
+    <string name="spoken_emoji_1F4EE" msgid="8464138906243608614">"Kotak postingan"</string>
     <string name="spoken_emoji_1F4EF" msgid="8801427577198798226">"Terompet kantor pos"</string>
     <string name="spoken_emoji_1F4F0" msgid="6330208624731662525">"Koran"</string>
     <string name="spoken_emoji_1F4F1" msgid="3966503935581675695">"Ponsel"</string>
@@ -1133,7 +1133,7 @@
     <string name="spoken_emoji_1F6A6" msgid="485575967773793454">"Lampu lalu lintas tegak lurus"</string>
     <string name="spoken_emoji_1F6A7" msgid="6411048933816976794">"Tanda kontruksi"</string>
     <string name="spoken_emoji_1F6A8" msgid="6345717218374788364">"Lampu putar mobil polisi"</string>
-    <string name="spoken_emoji_1F6A9" msgid="6586380356807600412">"Bendera segitiga di pos"</string>
+    <string name="spoken_emoji_1F6A9" msgid="6586380356807600412">"Bendera segitiga di postingan"</string>
     <string name="spoken_emoji_1F6AA" msgid="8954448167261738885">"Pintu"</string>
     <string name="spoken_emoji_1F6AB" msgid="5313946262888343544">"Tanda larangan masuk"</string>
     <string name="spoken_emoji_1F6AC" msgid="6946858177965948288">"Simbol merokok"</string>
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index 201ef99..5f2fb8e 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -22,7 +22,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="english_ime_input_options" msgid="3909945612939668554">"입력 옵션"</string>
     <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"연락처 이름 조회"</string>
-    <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"맞춤법 검사기가 주소록의 항목을 사용합니다."</string>
+    <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"맞춤법 검사기가 연락처 목록의 항목을 사용합니다."</string>
     <string name="vibrate_on_keypress" msgid="5258079494276955460">"키를 누를 때 진동 발생"</string>
     <string name="sound_on_keypress" msgid="6093592297198243644">"키를 누를 때 소리 발생"</string>
     <string name="popup_on_keypress" msgid="123894815723512944">"키를 누를 때 팝업"</string>
diff --git a/java/res/values-ne/strings-emoji-descriptions.xml b/java/res/values-ne/strings-emoji-descriptions.xml
index da709bb..19ae500 100644
--- a/java/res/values-ne/strings-emoji-descriptions.xml
+++ b/java/res/values-ne/strings-emoji-descriptions.xml
@@ -1018,7 +1018,7 @@
     <string name="spoken_emoji_1F607" msgid="2826424078212384817">"हेलो साथ हँसिलो अनुहार"</string>
     <string name="spoken_emoji_1F608" msgid="7343559595089811640">"सिंगहरु साथ हँसिलो अनुहार"</string>
     <string name="spoken_emoji_1F609" msgid="5481030187207504405">"आँखा झिम्काएको अनुहार"</string>
-    <string name="spoken_emoji_1F60A" msgid="5023337769148679767">"हँसिलो आँखाले साथ हँसिलो अनुहार"</string>
+    <string name="spoken_emoji_1F60A" msgid="5023337769148679767">"उज्यालो आँखासहित मुस्कुराइरहेको अनुहार"</string>
     <string name="spoken_emoji_1F60B" msgid="3005248217216195694">"स्वादिष्ट भोजन savoring अनुहार"</string>
     <string name="spoken_emoji_1F60C" msgid="349384012958268496">"ढुक्क अनुहार"</string>
     <string name="spoken_emoji_1F60D" msgid="7921853137164938391">"हृदय आकारको आँखाले हँसिलो अनुहार"</string>
diff --git a/java/res/values-pt-rPT/strings-emoji-descriptions.xml b/java/res/values-pt-rPT/strings-emoji-descriptions.xml
index 1096aac..6bc3dce 100644
--- a/java/res/values-pt-rPT/strings-emoji-descriptions.xml
+++ b/java/res/values-pt-rPT/strings-emoji-descriptions.xml
@@ -25,7 +25,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spoken_emoji_00A9" msgid="2859822817116803638">"Símbolo de direitos de autor"</string>
+    <string name="spoken_emoji_00A9" msgid="2859822817116803638">"Símbolo de Direitos de Autor"</string>
     <string name="spoken_emoji_00AE" msgid="7708335454134589027">"Símbolo de marca registada"</string>
     <string name="spoken_emoji_203C" msgid="153340916701508663">"Duplo ponto de exclamação"</string>
     <string name="spoken_emoji_2049" msgid="4877256448299555371">"Pontos de exclamação e de interrogação"</string>
diff --git a/java/res/values-sk/strings-emoji-descriptions.xml b/java/res/values-sk/strings-emoji-descriptions.xml
index 3afb3cd..f703687 100644
--- a/java/res/values-sk/strings-emoji-descriptions.xml
+++ b/java/res/values-sk/strings-emoji-descriptions.xml
@@ -777,7 +777,7 @@
     <string name="spoken_emoji_1F4C7" msgid="2665313547987324495">"Otočný vizitkár"</string>
     <string name="spoken_emoji_1F4C8" msgid="8007686702282833600">"Graf so vzostupujúcim trendom"</string>
     <string name="spoken_emoji_1F4C9" msgid="2271951411192893684">"Graf so zostupujúcim trendom"</string>
-    <string name="spoken_emoji_1F4CA" msgid="3525692829622381444">"Stĺpcový graf"</string>
+    <string name="spoken_emoji_1F4CA" msgid="3525692829622381444">"Pruhový graf"</string>
     <string name="spoken_emoji_1F4CB" msgid="977639227554095521">"Podložka na písanie s klipom"</string>
     <string name="spoken_emoji_1F4CC" msgid="156107396088741574">"Pripináčik"</string>
     <string name="spoken_emoji_1F4CD" msgid="4266572175361190231">"Guľatý pripináčik"</string>
diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml
index 6c09a66..cf2833f 100644
--- a/java/res/values-th/strings.xml
+++ b/java/res/values-th/strings.xml
@@ -44,7 +44,7 @@
     <string name="clear_sync_data_ok" msgid="613104067705915132">"ลบ"</string>
     <string name="cloud_sync_cancel" msgid="5877481252150919037">"ยกเลิก"</string>
     <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"พจนานุกรมส่วนตัวของคุณจะซิงค์และสำรองข้อมูลไปยังเซิร์ฟเวอร์ Google ข้อมูลเชิงสถิติของความถี่ในการใช้คำอาจได้รับการเก็บรวบรวมเพื่อใช้ปรับปรุงผลิตภัณฑ์ของเรา การเก็บรวบรวมและการใช้งานข้อมูลทั้งหมดจะเป็นไปอย่างสอดคล้องกับ"<a href="https://www.google.com/policies/privacy">"นโยบายความเป็นส่วนตัวของ Google"</a></string>
-    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"โปรดเพิ่มบัญชี Google ไปยังอุปกรณ์นี้เพื่อเปิดใช้คุณลักษณะนี้"</string>
+    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"โปรดเพิ่มบัญชี Google ไปยังอุปกรณ์นี้เพื่อเปิดใช้ฟีเจอร์นี้"</string>
     <string name="cloud_sync_summary_disabled_work_profile" msgid="1381770407303129164">"การซิงค์ไม่พร้อมใช้งานสำหรับอุปกรณ์ที่มีบัญชี Google Apps for Business"</string>
     <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"ใช้วิธีการป้อนข้อมูลอื่น"</string>
     <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"แป้นสลับภาษาครอบคลุมวิธีการป้อนข้อมูลอื่นๆ ด้วย"</string>
diff --git a/tests/Android.mk b/tests/Android.mk
index ad153ae..12d9cbe 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -24,7 +24,10 @@
 # Do not compress test data file
 LOCAL_AAPT_FLAGS += -0 .txt
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    mockito-target-minus-junit4 \
+    legacy-android-test
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)