diff --git a/Android.mk b/Android.mk
index c3b1094..48b12aa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,11 +5,12 @@
 #      the manifest files in java/com/android/incallui/calllocation/impl/
 #      and /java/com/android/incallui/maps/impl/
 # * b/62417801 removed translation string variant:
-#      java/com/android/incallui/res/values-af-mcc262-mnc01/strings.xml
+#      $ find java/com/android/incallui/res/*mcc262*/strings.xml | xargs rm
 # * b/62343966 include manually generated GRPC service class:
 #      $ protoc --plugin=protoc-gen-grpc-java=prebuilts/tools/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.3/protoc-gen-grpc-java-1.0.3-linux-x86_64.exe \
 #               --grpc-java_out=lite:"packages/apps/Dialer/java/com/android/voicemail/impl/" \
-#               --proto_path="packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/" "packages/apps/Dialer/java/com/android/voicemail/impl/transcribe
+#               --proto_path="packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/" "packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto"
+# * b/62787062 / b/37077388 temporarily disable proguard with javac
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -32,6 +33,7 @@
 
 # Exclude files incompatible with AOSP.
 EXCLUDE_FILES := \
+	$(BASE_DIR)/dialer/calllog/testing/FakeCallLogApplication.java \
 	$(BASE_DIR)/incallui/calllocation/impl/AuthException.java \
 	$(BASE_DIR)/incallui/calllocation/impl/CallLocationImpl.java \
 	$(BASE_DIR)/incallui/calllocation/impl/CallLocationModule.java \
@@ -73,11 +75,14 @@
 	$(BASE_DIR)/dialer/contactsfragment/res \
 	$(BASE_DIR)/dialer/dialpadview/res \
 	$(BASE_DIR)/dialer/interactions/res \
+	$(BASE_DIR)/dialer/main/impl/res \
 	$(BASE_DIR)/dialer/notification/res \
 	$(BASE_DIR)/dialer/oem/res \
 	$(BASE_DIR)/dialer/phonenumberutil/res \
 	$(BASE_DIR)/dialer/postcall/res \
-	$(BASE_DIR)/dialer/searchfragment/res \
+	$(BASE_DIR)/dialer/searchfragment/list/res \
+	$(BASE_DIR)/dialer/searchfragment/nearbyplaces/res \
+	$(BASE_DIR)/dialer/searchfragment/common/res \
 	$(BASE_DIR)/dialer/shortcuts/res \
 	$(BASE_DIR)/dialer/speeddial/res \
 	$(BASE_DIR)/dialer/theme/res \
@@ -128,11 +133,14 @@
 	$(BASE_DIR)/dialer/contactsfragment/AndroidManifest.xml \
 	$(BASE_DIR)/dialer/dialpadview/AndroidManifest.xml \
 	$(BASE_DIR)/dialer/interactions/AndroidManifest.xml \
+	$(BASE_DIR)/dialer/main/impl/AndroidManifest.xml \
 	$(BASE_DIR)/dialer/notification/AndroidManifest.xml \
 	$(BASE_DIR)/dialer/oem/AndroidManifest.xml \
 	$(BASE_DIR)/dialer/phonenumberutil/AndroidManifest.xml \
 	$(BASE_DIR)/dialer/postcall/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/searchfragment/AndroidManifest.xml \
+	$(BASE_DIR)/dialer/searchfragment/list/AndroidManifest.xml \
+	$(BASE_DIR)/dialer/searchfragment/nearbyplaces/AndroidManifest.xml \
+	$(BASE_DIR)/dialer/searchfragment/common/AndroidManifest.xml \
 	$(BASE_DIR)/dialer/shortcuts/AndroidManifest.xml \
 	$(BASE_DIR)/dialer/simulator/impl/AndroidManifest.xml \
 	$(BASE_DIR)/dialer/speeddial/AndroidManifest.xml \
@@ -199,11 +207,14 @@
 	--extra-packages com.android.dialer.contactsfragment \
 	--extra-packages com.android.dialer.dialpadview \
 	--extra-packages com.android.dialer.interactions \
+	--extra-packages com.android.dialer.main.impl \
 	--extra-packages com.android.dialer.notification \
 	--extra-packages com.android.dialer.oem \
 	--extra-packages com.android.dialer.phonenumberutil \
 	--extra-packages com.android.dialer.postcall \
-	--extra-packages com.android.dialer.searchfragment \
+	--extra-packages com.android.dialer.searchfragment.list \
+	--extra-packages com.android.dialer.searchfragment.nearbyplaces \
+	--extra-packages com.android.dialer.searchfragment.common \
 	--extra-packages com.android.dialer.shortcuts \
 	--extra-packages com.android.dialer.speeddial \
 	--extra-packages com.android.dialer.theme \
@@ -276,11 +287,6 @@
 LOCAL_JAVA_LIBRARIES := \
 	org.apache.http.legacy \
 	dialer-auto-value \
-	dialer-grpc-all \
-	dialer-grpc-core \
-	dialer-grpc-okhttp \
-	dialer-grpc-protobuf-lite \
-	dialer-grpc-stub \
 
 # Libraries needed by the compiler (JACK) to generate code.
 PROCESSOR_LIBRARIES_TARGET := \
@@ -300,6 +306,13 @@
 LOCAL_JACK_FLAGS += --processorpath $(call normalize-path-list,$(PROCESSOR_JARS))
 LOCAL_JAVACFLAGS += -processorpath $(call normalize-path-list,$(PROCESSOR_JARS))
 
+
+# Begin Bug: 37077388
+LOCAL_DX_FLAGS := --core-library --multi-dex
+LOCAL_JACK_FLAGS := --multi-dex native
+
+LOCAL_PROGUARD_ENABLED := disabled
+ifdef LOCAL_JACK_ENABLED
 # Proguard includes
 LOCAL_PROGUARD_FLAG_FILES := \
     java/com/android/dialer/common/proguard.flags \
@@ -309,11 +322,11 @@
     java/com/android/incallui/answer/impl/proguard.flags
 LOCAL_PROGUARD_ENABLED := custom
 
-ifdef LOCAL_JACK_ENABLED
-# Bug: 37077388
 LOCAL_PROGUARD_ENABLED += optimization
 endif
 
+# End Bug: 37077388
+
 LOCAL_SDK_VERSION := system_current
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := Dialer
@@ -517,3 +530,4 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
+
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7966a55..8dc9f6b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -55,6 +55,7 @@
   <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
   <uses-permission android:name="android.permission.SEND_SMS"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
   <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
   <!-- We use this to disable the status bar buttons of home, back and recent
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png
index ceb1a1e..fd3edbd 100644
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_grade_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_grade_white_24.png
index 86eecdd..dbbb9f6 100644
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_grade_white_24.png
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_grade_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_image_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_image_white_24.png
index b414cf5..caf34c2 100644
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_image_white_24.png
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_image_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png
index af7f828..3f1f3f8 100644
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_grade_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_grade_white_24.png
index d2cbe4c..d85d324 100644
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_grade_white_24.png
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_grade_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_image_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_image_white_24.png
index d474bd5..d17a3fa 100644
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_image_white_24.png
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_image_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png
index b7c7ffd..59c2fae 100644
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_grade_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_grade_white_24.png
index d65f39d..ce1f670 100644
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_grade_white_24.png
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_grade_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_image_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_image_white_24.png
index 2642b9e..07ee6bc 100644
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_image_white_24.png
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_image_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png
index 6b717e0..d5fd569 100644
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_grade_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_grade_white_24.png
index aa58792..44f3fdf 100644
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_grade_white_24.png
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_grade_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_image_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_image_white_24.png
index f9f1def..0059339 100644
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_image_white_24.png
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_image_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png
index 3964192..dac4e9c 100644
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_grade_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_grade_white_24.png
index 7f38d09..31000c6 100644
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_grade_white_24.png
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_grade_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_image_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_image_white_24.png
index 2ffdb55..f62cee6 100644
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_image_white_24.png
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_image_white_24.png
Binary files differ
diff --git a/java/com/android/contacts/common/ContactPhotoManager.java b/java/com/android/contacts/common/ContactPhotoManager.java
index 3e1a78f..fbf51cc 100644
--- a/java/com/android/contacts/common/ContactPhotoManager.java
+++ b/java/com/android/contacts/common/ContactPhotoManager.java
@@ -238,6 +238,9 @@
     badge.assignContactUri(contactUri);
     badge.setOverlay(null);
 
+    badge.setContentDescription(
+        badge.getContext().getString(R.string.description_quick_contact_for, displayName));
+
     String lookupKey = contactUri == null ? null : UriUtils.getLookupKeyFromUri(contactUri);
     ContactPhotoManager.DefaultImageRequest request =
         new ContactPhotoManager.DefaultImageRequest(
diff --git a/java/com/android/contacts/common/ContactPresenceIconUtil.java b/java/com/android/contacts/common/ContactPresenceIconUtil.java
index eeaf652..bce4b21 100644
--- a/java/com/android/contacts/common/ContactPresenceIconUtil.java
+++ b/java/com/android/contacts/common/ContactPresenceIconUtil.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.provider.ContactsContract.StatusUpdates;
+import android.support.v4.content.ContextCompat;
 
 /** Define the contact present show policy in Contacts */
 public class ContactPresenceIconUtil {
@@ -36,7 +37,7 @@
       case StatusUpdates.AWAY:
       case StatusUpdates.DO_NOT_DISTURB:
       case StatusUpdates.INVISIBLE:
-        return context.getResources().getDrawable(StatusUpdates.getPresenceIconResourceId(status));
+        return ContextCompat.getDrawable(context, StatusUpdates.getPresenceIconResourceId(status));
       case StatusUpdates.OFFLINE:
         // The undefined status is treated as OFFLINE in getPresenceIconResourceId();
       default:
diff --git a/java/com/android/contacts/common/compat/TelephonyManagerCompat.java b/java/com/android/contacts/common/compat/TelephonyManagerCompat.java
index 4a16fb8..02113ca 100644
--- a/java/com/android/contacts/common/compat/TelephonyManagerCompat.java
+++ b/java/com/android/contacts/common/compat/TelephonyManagerCompat.java
@@ -27,6 +27,7 @@
 import android.telephony.TelephonyManager;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.telecom.TelecomUtil;
 import java.lang.reflect.InvocationTargetException;
 
 public class TelephonyManagerCompat {
@@ -39,6 +40,8 @@
   public static final String EVENT_CALL_REMOTELY_HELD = "android.telecom.event.CALL_REMOTELY_HELD";
   public static final String EVENT_CALL_REMOTELY_UNHELD =
       "android.telecom.event.CALL_REMOTELY_UNHELD";
+  public static final String EVENT_MERGE_START = "android.telecom.event.MERGE_START";
+  public static final String EVENT_MERGE_COMPLETE = "android.telecom.event.MERGE_COMPLETE";
 
   public static final String EVENT_NOTIFY_INTERNATIONAL_CALL_ON_WFC =
       "android.telephony.event.EVENT_NOTIFY_INTERNATIONAL_CALL_ON_WFC";
@@ -163,6 +166,12 @@
   public static void handleSecretCode(Context context, String secretCode) {
     // Must use system service on O+ to avoid using broadcasts, which are not allowed on O+.
     if (BuildCompat.isAtLeastO()) {
+      if (!TelecomUtil.isDefaultDialer(context)) {
+        LogUtil.e(
+            "TelephonyManagerCompat.handleSecretCode",
+            "not default dialer, cannot send special code");
+        return;
+      }
       context.getSystemService(TelephonyManager.class).sendDialerSpecialCode(secretCode);
     } else {
       // System service call is not supported pre-O, so must use a broadcast for N-.
diff --git a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
index 43eae58..8393b26 100644
--- a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
+++ b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
@@ -18,6 +18,7 @@
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import java.lang.reflect.Field;
 
 /** Compatibility class for {@link android.telecom.TelecomManager}. */
 public class TelecomManagerCompat {
@@ -27,6 +28,13 @@
   public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS =
       "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS";
 
+  // Constants from http://cs/android/frameworks/base/telecomm/java/android/telecom/Call.java.
+  public static final String EVENT_REQUEST_HANDOVER = "android.telecom.event.REQUEST_HANDOVER";
+  public static final String EXTRA_HANDOVER_PHONE_ACCOUNT_HANDLE =
+      "android.telecom.extra.HANDOVER_PHONE_ACCOUNT_HANDLE";
+  public static final String EXTRA_HANDOVER_VIDEO_STATE =
+      "android.telecom.extra.HANDOVER_VIDEO_STATE";
+
   /**
    * Returns the current SIM call manager. Apps must be prepared for this method to return null,
    * indicating that there currently exists no registered SIM call manager.
@@ -41,4 +49,20 @@
     }
     return null;
   }
+
+  /**
+   * Handovers are supported from Android O-DR onward. Since there is no API bump from O to O-DR, we
+   * need to use reflection to check the existence of TelecomManager.EXTRA_IS_HANDOVER in
+   * http://cs/android/frameworks/base/telecomm/java/android/telecom/TelecomManager.java.
+   */
+  public static boolean supportsHandover() {
+    //
+    try {
+      Field field = TelecomManager.class.getDeclaredField("EXTRA_IS_HANDOVER");
+      return "android.telecom.extra.IS_HANDOVER".equals(field.get(null /* obj (static field) */));
+    } catch (Exception e) {
+      // Do nothing
+    }
+    return false;
+  }
 }
diff --git a/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java b/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java
index 2607ad1..6c932daf 100644
--- a/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java
+++ b/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java
@@ -15,14 +15,24 @@
 package com.android.contacts.common.extensions;
 
 import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.android.contacts.common.list.DirectoryPartition;
 import java.util.List;
 
 /** An interface for adding extended phone directories. */
 public interface PhoneDirectoryExtender {
+
   /**
    * Return a list of extended directories to add. May return null if no directories are to be
    * added.
    */
   List<DirectoryPartition> getExtendedDirectories(Context context);
+
+  /** returns true if the nearby places directory is enabled. */
+  boolean isEnabled(Context context);
+
+  /** Returns the content uri for nearby places. */
+  @Nullable
+  Uri getContentUri();
 }
diff --git a/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderAccessor.java b/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderAccessor.java
index 84649f1..7978831 100644
--- a/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderAccessor.java
+++ b/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderAccessor.java
@@ -16,6 +16,7 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
 import com.android.dialer.common.Assert;
 
 /** Accessor for the phone directory extender singleton. */
@@ -25,6 +26,11 @@
 
   private PhoneDirectoryExtenderAccessor() {}
 
+  @VisibleForTesting
+  public static void setForTesting(PhoneDirectoryExtender extender) {
+    instance = extender;
+  }
+
   @NonNull
   public static PhoneDirectoryExtender get(@NonNull Context context) {
     Assert.isNotNull(context);
diff --git a/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java b/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java
index 95f9715..4c3d3d1 100644
--- a/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java
+++ b/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java
@@ -15,6 +15,8 @@
 package com.android.contacts.common.extensions;
 
 import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.android.contacts.common.list.DirectoryPartition;
 import java.util.Collections;
 import java.util.List;
@@ -26,4 +28,15 @@
   public List<DirectoryPartition> getExtendedDirectories(Context context) {
     return Collections.emptyList();
   }
+
+  @Override
+  public boolean isEnabled(Context context) {
+    return false;
+  }
+
+  @Nullable
+  @Override
+  public Uri getContentUri() {
+    return null;
+  }
 }
diff --git a/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java b/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java
index 5e77b69..5c401fe 100644
--- a/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java
+++ b/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java
@@ -29,6 +29,7 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.telecom.TelecomManager;
 import android.text.TextUtils;
@@ -124,10 +125,16 @@
       sLetterToTileRatio = res.getFraction(R.dimen.letter_to_tile_ratio, 1, 1);
       sDefaultPersonAvatar =
           res.getDrawable(R.drawable.product_logo_avatar_anonymous_white_color_120, null);
+      Assert.isNotNull(sDefaultPersonAvatar, "sDefaultPersonAvatar is null");
       sDefaultBusinessAvatar = res.getDrawable(R.drawable.quantum_ic_business_vd_theme_24, null);
+      Assert.isNotNull(sDefaultBusinessAvatar, "sDefaultBusinessAvatar is null");
       sDefaultVoicemailAvatar = res.getDrawable(R.drawable.quantum_ic_voicemail_vd_theme_24, null);
+      Assert.isNotNull(sDefaultVoicemailAvatar, "sDefaultVoicemailAvatar is null");
       sDefaultSpamAvatar = res.getDrawable(R.drawable.quantum_ic_report_vd_theme_24, null);
+      Assert.isNotNull(sDefaultSpamAvatar, "sDefaultSpamAvatar is null");
       sDefaultConferenceAvatar = res.getDrawable(R.drawable.quantum_ic_group_vd_theme_24, null);
+      Assert.isNotNull(sDefaultConferenceAvatar, "sDefaultConferenceAvatar is null");
+
       sPaint.setTypeface(
           Typeface.create(res.getString(R.string.letter_tile_letter_font_family), Typeface.NORMAL));
       sPaint.setTextAlign(Align.CENTER);
@@ -180,7 +187,7 @@
   }
 
   @Override
-  public void draw(final Canvas canvas) {
+  public void draw(@NonNull final Canvas canvas) {
     final Rect bounds = getBounds();
     if (!isVisible() || bounds.isEmpty()) {
       return;
@@ -235,6 +242,11 @@
     } else {
       // Draw the default image if there is no letter/digit to be drawn
       Drawable drawable = getDrawableForContactType(mContactType);
+      if (drawable == null) {
+        throw Assert.createIllegalStateFailException(
+            "Unable to find drawable for contact type " + mContactType);
+      }
+
       drawable.setBounds(getScaledBounds(mScale, mOffset));
       drawable.setAlpha(drawable == sDefaultSpamAvatar ? SPAM_ALPHA : ALPHA);
       drawable.draw(canvas);
diff --git a/java/com/android/contacts/common/list/ContactEntryListAdapter.java b/java/com/android/contacts/common/list/ContactEntryListAdapter.java
index 064214e..7335297 100644
--- a/java/com/android/contacts/common/list/ContactEntryListAdapter.java
+++ b/java/com/android/contacts/common/list/ContactEntryListAdapter.java
@@ -40,6 +40,7 @@
 import com.android.contacts.common.util.SearchUtil;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
 import java.util.HashSet;
@@ -55,7 +56,6 @@
    */
   public static final boolean LOCAL_INVISIBLE_DIRECTORY_ENABLED = false;
 
-  private static final String TAG = "ContactEntryListAdapter";
   private int mDisplayOrder;
   private int mSortOrder;
 
@@ -82,6 +82,8 @@
   private ContactListFilter mFilter;
   private boolean mDarkTheme = false;
 
+  public static final int SUGGESTIONS_LOADER_ID = 0;
+
   /** Resource used to provide header-text for default filter. */
   private CharSequence mDefaultFilterHeaderText;
 
@@ -130,9 +132,22 @@
   }
 
   protected void addPartitions() {
+    if (ConfigProviderBindings.get(getContext()).getBoolean("p13n_ranker_should_enable", false)) {
+      addPartition(createSuggestionsDirectoryPartition());
+    }
     addPartition(createDefaultDirectoryPartition());
   }
 
+  protected DirectoryPartition createSuggestionsDirectoryPartition() {
+    DirectoryPartition partition = new DirectoryPartition(true, true);
+    partition.setDirectoryId(SUGGESTIONS_LOADER_ID);
+    partition.setDirectoryType(getContext().getString(R.string.contact_suggestions));
+    partition.setPriorityDirectory(true);
+    partition.setPhotoSupported(true);
+    partition.setLabel(getContext().getString(R.string.local_suggestions_search_label));
+    return partition;
+  }
+
   protected DirectoryPartition createDefaultDirectoryPartition() {
     DirectoryPartition partition = new DirectoryPartition(true, true);
     partition.setDirectoryId(Directory.DEFAULT);
@@ -245,6 +260,11 @@
     } else {
       mUpperCaseQueryString = SearchUtil.cleanStartAndEndOfSearchQuery(queryString.toUpperCase());
     }
+
+    // Enable default partition header if in search mode (including zero-suggest).
+    if (mQueryString != null) {
+      setDefaultPartitionHeader(true);
+    }
   }
 
   public String getUpperCaseQueryString() {
@@ -356,9 +376,9 @@
     if (cursor.getCount() == 0) {
       // Directory table must have at least local directory, without which this adapter will
       // enter very weird state.
-      LogUtil.e(
-          TAG,
-          "Directory search loader returned an empty cursor, which implies we have "
+      LogUtil.i(
+          "ContactEntryListAdapter.changeDirectories",
+          "directory search loader returned an empty cursor, which implies we have "
               + "no directory entries.",
           new RuntimeException());
       return;
@@ -531,22 +551,27 @@
     return false;
   }
 
-  /** Changes visibility parameters for the default directory partition. */
-  public void configureDefaultPartition(boolean showIfEmpty, boolean hasHeader) {
+  /** Configures visibility parameters for the directory partitions. */
+  public void configurePartitionsVisibility(boolean isInSearchMode) {
+    for (int i = 0; i < getPartitionCount(); i++) {
+      setShowIfEmpty(i, false);
+      setHasHeader(i, isInSearchMode);
+    }
+  }
+
+  // Sets header for the default partition.
+  private void setDefaultPartitionHeader(boolean setHeader) {
+    // Iterate in reverse here to ensure the first DEFAULT directory has header.
+    // Both "Suggestions" and "All Contacts" directories have DEFAULT id.
     int defaultPartitionIndex = -1;
-    int count = getPartitionCount();
-    for (int i = 0; i < count; i++) {
+    for (int i = getPartitionCount() - 1; i >= 0; i--) {
       Partition partition = getPartition(i);
       if (partition instanceof DirectoryPartition
           && ((DirectoryPartition) partition).getDirectoryId() == Directory.DEFAULT) {
         defaultPartitionIndex = i;
-        break;
       }
     }
-    if (defaultPartitionIndex != -1) {
-      setShowIfEmpty(defaultPartitionIndex, showIfEmpty);
-      setHasHeader(defaultPartitionIndex, hasHeader);
-    }
+    setHasHeader(defaultPartitionIndex, setHeader);
   }
 
   @Override
diff --git a/java/com/android/contacts/common/list/ContactEntryListFragment.java b/java/com/android/contacts/common/list/ContactEntryListFragment.java
index 146986f..04658be 100644
--- a/java/com/android/contacts/common/list/ContactEntryListFragment.java
+++ b/java/com/android/contacts/common/list/ContactEntryListFragment.java
@@ -47,6 +47,7 @@
 import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.contacts.common.util.ContactListViewUtils;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.performancereport.PerformanceReport;
 import java.lang.ref.WeakReference;
 import java.util.Locale;
 
@@ -440,6 +441,11 @@
       return;
     }
 
+    // Return for non-"Suggestions" if on the zero-suggest screen.
+    if (TextUtils.isEmpty(mQueryString) && partitionIndex > 0) {
+      return;
+    }
+
     mAdapter.changeCursor(partitionIndex, data);
     setProfileHeader();
 
@@ -571,7 +577,7 @@
           // should be cleaned up on exiting the search mode.
           mAdapter.removeDirectoriesAfterDefault();
         }
-        mAdapter.configureDefaultPartition(false, flag);
+        mAdapter.configurePartitionsVisibility(flag);
       }
 
       if (mListView != null) {
@@ -675,22 +681,16 @@
 
     boolean searchMode = isSearchMode();
     mAdapter.setSearchMode(searchMode);
-    mAdapter.configureDefaultPartition(false, searchMode);
+    mAdapter.configurePartitionsVisibility(searchMode);
     mAdapter.setPhotoLoader(mPhotoManager);
     mListView.setAdapter(mAdapter);
-
-    if (!isSearchMode()) {
-      mListView.setFocusableInTouchMode(true);
-      mListView.requestFocus();
-    }
-
     return mView;
   }
 
   protected void onCreateView(LayoutInflater inflater, ViewGroup container) {
     mView = inflateView(inflater, container);
 
-    mListView = (ListView) mView.findViewById(android.R.id.list);
+    mListView = mView.findViewById(android.R.id.list);
     if (mListView == null) {
       throw new RuntimeException(
           "Your content must have a ListView whose id attribute is " + "'android.R.id.list'");
@@ -769,6 +769,7 @@
 
   @Override
   public void onScrollStateChanged(AbsListView view, int scrollState) {
+    PerformanceReport.recordScrollStateChange(scrollState);
     if (scrollState == OnScrollListener.SCROLL_STATE_FLING) {
       mPhotoManager.pause();
     } else if (isPhotoLoaderEnabled()) {
diff --git a/java/com/android/contacts/common/list/ContactListItemView.java b/java/com/android/contacts/common/list/ContactListItemView.java
index 5a27491..91abe4c 100644
--- a/java/com/android/contacts/common/list/ContactListItemView.java
+++ b/java/com/android/contacts/common/list/ContactListItemView.java
@@ -330,19 +330,19 @@
     int description;
     OnClickListener onClickListener;
     if (action == CALL_AND_SHARE) {
-      drawable = getContext().getResources().getDrawable(R.drawable.ic_phone_attach);
+      drawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_phone_attach);
       drawable.setAutoMirrored(true);
       description = R.string.description_search_call_and_share;
       onClickListener = v -> listener.onCallAndShareIconClicked(position);
     } else if (action == VIDEO && mSupportVideoCall) {
       drawable =
-          getContext().getResources().getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
+          ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
       drawable.setAutoMirrored(true);
       description = R.string.description_search_video_call;
       onClickListener = v -> listener.onVideoCallIconClicked(position);
     } else if (action == LIGHTBRINGER) {
       drawable =
-          getContext().getResources().getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
+          ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
       drawable.setAutoMirrored(true);
       description = R.string.description_search_video_call;
       onClickListener = v -> listener.onLightbringerIconClicked(position);
diff --git a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
index 65e6f2d..d1118c3 100644
--- a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
@@ -69,7 +69,6 @@
   // A list of extended directories to add to the directories from the database
   private final List<DirectoryPartition> mExtendedDirectories;
   private final CharSequence mUnknownNameText;
-  private final boolean mIsPresenceEnabled;
   protected final boolean mIsImsVideoEnabled;
 
   // Extended directories will have ID's that are higher than any of the id's from the database,
@@ -88,8 +87,9 @@
         PhoneDirectoryExtenderAccessor.get(mContext).getExtendedDirectories(mContext);
 
     int videoCapabilities = CallUtil.getVideoCallingAvailability(context);
-    mIsImsVideoEnabled = CallUtil.isVideoEnabled(context);
-    mIsPresenceEnabled = (videoCapabilities & CallUtil.VIDEO_CALLING_PRESENCE) != 0;
+    mIsImsVideoEnabled =
+        CallUtil.isVideoEnabled(context)
+            && (videoCapabilities & CallUtil.VIDEO_CALLING_PRESENCE) != 0;
   }
 
   @Override
@@ -351,14 +351,8 @@
     }
 
     final DirectoryPartition directory = (DirectoryPartition) getPartition(partition);
-
-    // If the first partition does not have a header, then all subsequent partitions'
-    // getPositionForPartition returns an index off by 1.
-    int partitionOffset = 0;
-    if (partition > 0 && !getPartition(0).getHasHeader()) {
-      partitionOffset = 1;
-    }
-    position += getPositionForPartition(partition) + partitionOffset;
+    // All sections have headers, so scroll position is off by 1.
+    position += getPositionForPartition(partition) + 1;
 
     bindPhoneNumber(view, cursor, directory.isDisplayNumber(), position);
   }
@@ -397,8 +391,8 @@
       int carrierPresence = cursor.getInt(PhoneQuery.CARRIER_PRESENCE);
       boolean isPresent = (carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) != 0;
 
-      boolean isVideoIconShown = mIsImsVideoEnabled && (!mIsPresenceEnabled || isPresent);
-      if (isVideoIconShown) {
+      boolean showViewIcon = mIsImsVideoEnabled && isPresent;
+      if (showViewIcon) {
         action = ContactListItemView.VIDEO;
       }
     }
diff --git a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
index 79e6700..de7903e 100644
--- a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
+++ b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
@@ -42,6 +42,7 @@
 import com.android.dialer.lightbringer.LightbringerComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.protos.ProtoParsers;
 import java.util.Set;
 import org.json.JSONException;
@@ -91,6 +92,7 @@
 
   @Override
   public void onLightbringerIconClicked(int position) {
+    PerformanceReport.stopRecording();
     String phoneNumber = getPhoneNumber(position);
     Intent intent =
         LightbringerComponent.get(getContext())
@@ -282,7 +284,7 @@
         && data != null
         && !data.isClosed()
         && data.getCount() > 0
-        && loader.getId() != -1) { // skip invalid directory ID of -1
+        && loader.getId() == 0) { // only re-rank if a suggestions loader with id of 0.
       data = mCursorReranker.rerankCursor(data);
     }
     super.onLoadFinished(loader, data);
diff --git a/java/com/android/contacts/common/model/account/AccountType.java b/java/com/android/contacts/common/model/account/AccountType.java
index 1ae485a..ed0d421 100644
--- a/java/com/android/contacts/common/model/account/AccountType.java
+++ b/java/com/android/contacts/common/model/account/AccountType.java
@@ -25,6 +25,7 @@
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.RawContacts;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.content.ContextCompat;
 import android.util.ArrayMap;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
@@ -113,7 +114,7 @@
       final PackageManager pm = context.getPackageManager();
       return pm.getDrawable(syncAdapterPackageName, iconRes, null);
     } else if (titleRes != -1) {
-      return context.getResources().getDrawable(iconRes);
+      return ContextCompat.getDrawable(context, iconRes);
     } else {
       return null;
     }
diff --git a/java/com/android/contacts/common/res/values-af/strings.xml b/java/com/android/contacts/common/res/values-af/strings.xml
index 48e4158..4ca39cf 100644
--- a/java/com/android/contacts/common/res/values-af/strings.xml
+++ b/java/com/android/contacts/common/res/values-af/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Weg"</string>
     <string name="status_busy" msgid="5990832098713248503">"Besig"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakte"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Topvoorgestel"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Ander"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Gids"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Werkgids"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle kontakte"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Voorstelle"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ek"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Soek tans…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Meer as <xliff:g id="COUNT">%d</xliff:g> gevind."</string>
diff --git a/java/com/android/contacts/common/res/values-am/strings.xml b/java/com/android/contacts/common/res/values-am/strings.xml
index 4121474..d216b0b 100644
--- a/java/com/android/contacts/common/res/values-am/strings.xml
+++ b/java/com/android/contacts/common/res/values-am/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"ወጣ ብሏል"</string>
     <string name="status_busy" msgid="5990832098713248503">"ተይዟል"</string>
     <string name="contactsList" msgid="8806067891419291513">"እውቅያዎች"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"በብዛት የተጠቆሙ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ሌላ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ማውጫ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"የሥራ ስልክ ማውጫ"</string>
     <string name="local_search_label" msgid="907622822323119235">"ሁሉም እውቅያዎች"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ጥቆማዎች"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"እኔ"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"በመፈለግ ላይ…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"ከ<xliff:g id="COUNT">%d</xliff:g> በላይ ተገኝተዋል።"</string>
diff --git a/java/com/android/contacts/common/res/values-ar/strings.xml b/java/com/android/contacts/common/res/values-ar/strings.xml
index 98fb057..040b544 100644
--- a/java/com/android/contacts/common/res/values-ar/strings.xml
+++ b/java/com/android/contacts/common/res/values-ar/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"بالخارج"</string>
     <string name="status_busy" msgid="5990832098713248503">"مشغول"</string>
     <string name="contactsList" msgid="8806067891419291513">"جهات الاتصال"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"أهم المقترحات"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"غير ذلك"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"الدليل"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"دليل العمل"</string>
     <string name="local_search_label" msgid="907622822323119235">"جميع جهات الاتصال"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"الاقتراحات"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"أنا"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"جارِ البحث…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"تم العثور على أكثر من <xliff:g id="COUNT">%d</xliff:g> من جهات الاتصال."</string>
diff --git a/java/com/android/contacts/common/res/values-az/strings.xml b/java/com/android/contacts/common/res/values-az/strings.xml
index 813ada7..13250f7 100644
--- a/java/com/android/contacts/common/res/values-az/strings.xml
+++ b/java/com/android/contacts/common/res/values-az/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Kənar"</string>
     <string name="status_busy" msgid="5990832098713248503">"Məşğul"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktlar"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Ən yaxşı Təkliflər"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Digər"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Kataloq"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"İş kataloqu"</string>
     <string name="local_search_label" msgid="907622822323119235">"Bütün kontaktlar"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Təkliflər"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mən"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Axtarılır..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ədəddən çox tapılıb."</string>
diff --git a/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml b/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml
index 3eccfc6..d3b6b0c 100644
--- a/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Odsutan/na"</string>
     <string name="status_busy" msgid="5990832098713248503">"Zauzet/a"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakti"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najpopularniji predlozi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Drugo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktorijum"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Direktorijum za Work"</string>
     <string name="local_search_label" msgid="907622822323119235">"Svi kontakti"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Predlozi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Pretražuje se…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Pronađeno je više od <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-be/strings.xml b/java/com/android/contacts/common/res/values-be/strings.xml
index 99922a8..ca8f164 100644
--- a/java/com/android/contacts/common/res/values-be/strings.xml
+++ b/java/com/android/contacts/common/res/values-be/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Адсутнічае"</string>
     <string name="status_busy" msgid="5990832098713248503">"Заняты"</string>
     <string name="contactsList" msgid="8806067891419291513">"Кантакты"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Лепшыя прапановы"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Іншае"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Дырэкторыя"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Працоўны каталог"</string>
     <string name="local_search_label" msgid="907622822323119235">"Усе кантакты"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Прапановы"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Я"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Пошук..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Знойдзена вынікаў: больш за <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-bg/strings.xml b/java/com/android/contacts/common/res/values-bg/strings.xml
index c2ebd27..4fdcc8c 100644
--- a/java/com/android/contacts/common/res/values-bg/strings.xml
+++ b/java/com/android/contacts/common/res/values-bg/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Отсъства"</string>
     <string name="status_busy" msgid="5990832098713248503">"Зает/а"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Водещи предложения"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Други"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Директория"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Служебен указател"</string>
     <string name="local_search_label" msgid="907622822323119235">"Всички контакти"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Предложения"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Аз"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Търси се…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Намерени са повече от <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-bn/strings.xml b/java/com/android/contacts/common/res/values-bn/strings.xml
index 47e9b02..debbe58 100644
--- a/java/com/android/contacts/common/res/values-bn/strings.xml
+++ b/java/com/android/contacts/common/res/values-bn/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"অন্যত্র"</string>
     <string name="status_busy" msgid="5990832098713248503">"ব্যস্ত"</string>
     <string name="contactsList" msgid="8806067891419291513">"পরিচিতিগুলি"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"শীর্ষস্থানীয় প্রস্তাবনা"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"অন্যান্য"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ডিরেক্টরি"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"কাজের সংগ্রহ"</string>
     <string name="local_search_label" msgid="907622822323119235">"সকল পরিচিতি"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"প্রস্তাবনাগুলি"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"আমি"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"অনুসন্ধান করছে..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>টির থেকে বেশি খুঁজে পাওয়া গিয়েছে৷"</string>
diff --git a/java/com/android/contacts/common/res/values-bs/strings.xml b/java/com/android/contacts/common/res/values-bs/strings.xml
index 305a746..c5f85e5 100644
--- a/java/com/android/contacts/common/res/values-bs/strings.xml
+++ b/java/com/android/contacts/common/res/values-bs/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Odsutan"</string>
     <string name="status_busy" msgid="5990832098713248503">"Zauzeto"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakti"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najbolji prijedlozi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Ostalo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Imenik"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Poslovni imenik"</string>
     <string name="local_search_label" msgid="907622822323119235">"Svi kontakti"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Prijedlozi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Pretraživanje…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Pronađeno je više od <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-ca/strings.xml b/java/com/android/contacts/common/res/values-ca/strings.xml
index 8e80686..7e814ff 100644
--- a/java/com/android/contacts/common/res/values-ca/strings.xml
+++ b/java/com/android/contacts/common/res/values-ca/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Absent"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupat"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contactes"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Suggeriments principals"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Altres"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directori"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directori de la feina"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tots els contactes"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggeriments"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Jo"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"S\'està cercant…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Se n\'han trobat més de <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-cs/strings.xml b/java/com/android/contacts/common/res/values-cs/strings.xml
index 7aea200..0bea069 100644
--- a/java/com/android/contacts/common/res/values-cs/strings.xml
+++ b/java/com/android/contacts/common/res/values-cs/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Pryč"</string>
     <string name="status_busy" msgid="5990832098713248503">"Nemám čas"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakty"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Hlavní návrhy"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Ostatní"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Adresář"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Pracovní adresář"</string>
     <string name="local_search_label" msgid="907622822323119235">"Všechny kontakty"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Návrhy"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Já"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Vyhledávání..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Nalezeno více kontaktů než <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-da/strings.xml b/java/com/android/contacts/common/res/values-da/strings.xml
index 430895a..c000b2f 100644
--- a/java/com/android/contacts/common/res/values-da/strings.xml
+++ b/java/com/android/contacts/common/res/values-da/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Ikke til stede"</string>
     <string name="status_busy" msgid="5990832098713248503">"Optaget"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Populære forslag"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Andre"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Indeks"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Indeks for arbejde"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle kontakter"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Forslag"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mig"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Søger..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Der er fundet mere end <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-de/strings.xml b/java/com/android/contacts/common/res/values-de/strings.xml
index a46f278..90e1336 100644
--- a/java/com/android/contacts/common/res/values-de/strings.xml
+++ b/java/com/android/contacts/common/res/values-de/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Abwesend"</string>
     <string name="status_busy" msgid="5990832098713248503">"Beschäftigt"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakte"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Top-Vorschläge"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Andere"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Verzeichnis"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Verzeichnis geschäftlicher Kontakte"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle Kontakte"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Vorschläge"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ich"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Suche läuft..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Mehr als <xliff:g id="COUNT">%d</xliff:g> Kontakte gefunden"</string>
diff --git a/java/com/android/contacts/common/res/values-el/strings.xml b/java/com/android/contacts/common/res/values-el/strings.xml
index 567b8fb..33d2db4 100644
--- a/java/com/android/contacts/common/res/values-el/strings.xml
+++ b/java/com/android/contacts/common/res/values-el/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Μη διαθέσιμος"</string>
     <string name="status_busy" msgid="5990832098713248503">"Απασχολημένος"</string>
     <string name="contactsList" msgid="8806067891419291513">"Επαφές"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Κορυφαίες προτάσεις"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Άλλο"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Κατάλογος"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Κατάλογος εργασίας"</string>
     <string name="local_search_label" msgid="907622822323119235">"Όλες οι επαφές"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Προτάσεις"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Εγώ"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Αναζήτηση..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Βρέθηκαν περισσότερα από <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-en-rAU/strings.xml b/java/com/android/contacts/common/res/values-en-rAU/strings.xml
index 660993d..e4e09dc 100644
--- a/java/com/android/contacts/common/res/values-en-rAU/strings.xml
+++ b/java/com/android/contacts/common/res/values-en-rAU/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Away"</string>
     <string name="status_busy" msgid="5990832098713248503">"Busy"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Top suggested"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Other"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Work directory"</string>
     <string name="local_search_label" msgid="907622822323119235">"All contacts"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Me"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Searching…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"More than <xliff:g id="COUNT">%d</xliff:g> found."</string>
diff --git a/java/com/android/contacts/common/res/values-en-rGB/strings.xml b/java/com/android/contacts/common/res/values-en-rGB/strings.xml
index 660993d..e4e09dc 100644
--- a/java/com/android/contacts/common/res/values-en-rGB/strings.xml
+++ b/java/com/android/contacts/common/res/values-en-rGB/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Away"</string>
     <string name="status_busy" msgid="5990832098713248503">"Busy"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Top suggested"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Other"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Work directory"</string>
     <string name="local_search_label" msgid="907622822323119235">"All contacts"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Me"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Searching…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"More than <xliff:g id="COUNT">%d</xliff:g> found."</string>
diff --git a/java/com/android/contacts/common/res/values-en-rIN/strings.xml b/java/com/android/contacts/common/res/values-en-rIN/strings.xml
index 660993d..e4e09dc 100644
--- a/java/com/android/contacts/common/res/values-en-rIN/strings.xml
+++ b/java/com/android/contacts/common/res/values-en-rIN/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Away"</string>
     <string name="status_busy" msgid="5990832098713248503">"Busy"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Top suggested"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Other"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Work directory"</string>
     <string name="local_search_label" msgid="907622822323119235">"All contacts"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Me"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Searching…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"More than <xliff:g id="COUNT">%d</xliff:g> found."</string>
diff --git a/java/com/android/contacts/common/res/values-es-rUS/strings.xml b/java/com/android/contacts/common/res/values-es-rUS/strings.xml
index 1c0339a..894c352 100644
--- a/java/com/android/contacts/common/res/values-es-rUS/strings.xml
+++ b/java/com/android/contacts/common/res/values-es-rUS/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Principales lugares sugeridos"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Otros"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directorio"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directorio del trabajo"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos los contactos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugerencias"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Yo"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Buscando..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Más de <xliff:g id="COUNT">%d</xliff:g> encontrados"</string>
diff --git a/java/com/android/contacts/common/res/values-es/strings.xml b/java/com/android/contacts/common/res/values-es/strings.xml
index b0956ec..39e11d7 100644
--- a/java/com/android/contacts/common/res/values-es/strings.xml
+++ b/java/com/android/contacts/common/res/values-es/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Sugerencias principales"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Otro"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directorio"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directorio de trabajo"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos los contactos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugerencias"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Yo"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Buscando..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Se han encontrado más de <xliff:g id="COUNT">%d</xliff:g> contactos."</string>
diff --git a/java/com/android/contacts/common/res/values-et/strings.xml b/java/com/android/contacts/common/res/values-et/strings.xml
index e152f59..e146038 100644
--- a/java/com/android/contacts/common/res/values-et/strings.xml
+++ b/java/com/android/contacts/common/res/values-et/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Eemal"</string>
     <string name="status_busy" msgid="5990832098713248503">"Hõivatud"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktid"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Populaarsed soovitused"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Muu"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Kataloog"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Töökontaktide kataloog"</string>
     <string name="local_search_label" msgid="907622822323119235">"Kõik kontaktid"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Soovitused"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mina"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Otsimine ..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Leitud rohkem kui <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-eu/strings.xml b/java/com/android/contacts/common/res/values-eu/strings.xml
index 967b635..9caf1f1 100644
--- a/java/com/android/contacts/common/res/values-eu/strings.xml
+++ b/java/com/android/contacts/common/res/values-eu/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Kanpoan"</string>
     <string name="status_busy" msgid="5990832098713248503">"Okupatuta"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktuak"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Iradokizun garrantzitsuenak"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Beste bat"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktorioa"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Laneko kontaktuak"</string>
     <string name="local_search_label" msgid="907622822323119235">"Kontaktu guztiak"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Iradokizunak"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ni"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Bilatzen…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> baino gehiago aurkitu dira."</string>
diff --git a/java/com/android/contacts/common/res/values-fa/strings.xml b/java/com/android/contacts/common/res/values-fa/strings.xml
index 3650e46..c0bc010 100644
--- a/java/com/android/contacts/common/res/values-fa/strings.xml
+++ b/java/com/android/contacts/common/res/values-fa/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"غایب"</string>
     <string name="status_busy" msgid="5990832098713248503">"مشغول"</string>
     <string name="contactsList" msgid="8806067891419291513">"مخاطبین"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"پیشنهادهای برتر"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"سایر موارد"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"فهرست"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"فهرست کار"</string>
     <string name="local_search_label" msgid="907622822323119235">"همه مخاطبین"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"پیشنهادها"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"من"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"در حال جستجو…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"بیش از <xliff:g id="COUNT">%d</xliff:g> مورد یافت شد."</string>
diff --git a/java/com/android/contacts/common/res/values-fi/strings.xml b/java/com/android/contacts/common/res/values-fi/strings.xml
index b7739de..c124765 100644
--- a/java/com/android/contacts/common/res/values-fi/strings.xml
+++ b/java/com/android/contacts/common/res/values-fi/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Poissa"</string>
     <string name="status_busy" msgid="5990832098713248503">"Varattu"</string>
     <string name="contactsList" msgid="8806067891419291513">"Yhteystiedot"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Kiinnostavimmat ehdotukset"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Muu"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Osoitekirja"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Työhakemisto"</string>
     <string name="local_search_label" msgid="907622822323119235">"Kaikki yhteystiedot"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Ehdotukset"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Minä"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Haetaan…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Löytyi yli <xliff:g id="COUNT">%d</xliff:g> yhteystietoa."</string>
diff --git a/java/com/android/contacts/common/res/values-fr-rCA/strings.xml b/java/com/android/contacts/common/res/values-fr-rCA/strings.xml
index c20b882..c055408 100644
--- a/java/com/android/contacts/common/res/values-fr-rCA/strings.xml
+++ b/java/com/android/contacts/common/res/values-fr-rCA/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Absent"</string>
     <string name="status_busy" msgid="5990832098713248503">"Occupé(e)"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Meilleures suggestions"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Autre"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Répertoire"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Annuaire professionnel"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tous les contacts"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Moi"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Recherche en cours…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Plus de <xliff:g id="COUNT">%d</xliff:g> contacts ont été trouvés."</string>
diff --git a/java/com/android/contacts/common/res/values-fr/strings.xml b/java/com/android/contacts/common/res/values-fr/strings.xml
index 93b52dc..a47a5a2 100644
--- a/java/com/android/contacts/common/res/values-fr/strings.xml
+++ b/java/com/android/contacts/common/res/values-fr/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Absent"</string>
     <string name="status_busy" msgid="5990832098713248503">"Occupé"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Principaux dossiers recommandés"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Autre"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Répertoire"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Contacts professionnels"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tous les contacts"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Moi"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Recherche..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Plus de <xliff:g id="COUNT">%d</xliff:g> contacts ont été trouvés."</string>
diff --git a/java/com/android/contacts/common/res/values-gl/strings.xml b/java/com/android/contacts/common/res/values-gl/strings.xml
index 4aa1fc1..a90481d 100644
--- a/java/com/android/contacts/common/res/values-gl/strings.xml
+++ b/java/com/android/contacts/common/res/values-gl/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Suxestións destacadas"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Outro"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directorio"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directorio de traballo"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos os contactos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suxestións"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Buscando..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Encontráronse máis de <xliff:g id="COUNT">%d</xliff:g> contactos."</string>
diff --git a/java/com/android/contacts/common/res/values-gu/strings.xml b/java/com/android/contacts/common/res/values-gu/strings.xml
index 8bbfb3a..9b1a6a8 100644
--- a/java/com/android/contacts/common/res/values-gu/strings.xml
+++ b/java/com/android/contacts/common/res/values-gu/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"દૂર"</string>
     <string name="status_busy" msgid="5990832098713248503">"વ્યસ્ત"</string>
     <string name="contactsList" msgid="8806067891419291513">"સંપર્કો"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ટોચના સૂચવેલ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"અન્ય"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"નિર્દેશિકા"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"કાર્ય નિર્દેશિકા"</string>
     <string name="local_search_label" msgid="907622822323119235">"તમામ સંપર્કો"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"સૂચનો"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"હું"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"શોધી રહ્યું છે..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> કરતાં વધુ મળ્યાં."</string>
diff --git a/java/com/android/contacts/common/res/values-hi/strings.xml b/java/com/android/contacts/common/res/values-hi/strings.xml
index c1af9b7..e33f7d2 100644
--- a/java/com/android/contacts/common/res/values-hi/strings.xml
+++ b/java/com/android/contacts/common/res/values-hi/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"दूर"</string>
     <string name="status_busy" msgid="5990832098713248503">"व्यस्त"</string>
     <string name="contactsList" msgid="8806067891419291513">"संपर्क"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"शीर्ष सुझाव"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"अन्य"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"निर्देशिका"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"कार्य निर्देशिका"</string>
     <string name="local_search_label" msgid="907622822323119235">"सभी संपर्क"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"सुझाव"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"मुझे"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"खोज रहा है..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> से अधिक मिले."</string>
diff --git a/java/com/android/contacts/common/res/values-hr/strings.xml b/java/com/android/contacts/common/res/values-hr/strings.xml
index a60c884..d6e0b10 100644
--- a/java/com/android/contacts/common/res/values-hr/strings.xml
+++ b/java/com/android/contacts/common/res/values-hr/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Odsutan"</string>
     <string name="status_busy" msgid="5990832098713248503">"Zauzet"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakti"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najbolji prijedlozi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Drugo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktorij"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Poslovni direktorij"</string>
     <string name="local_search_label" msgid="907622822323119235">"Svi kontakti"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Prijedlozi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Pretraživanje…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Pronađeno je više od <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-hu/strings.xml b/java/com/android/contacts/common/res/values-hu/strings.xml
index 19fbbe8..44bf9c8 100644
--- a/java/com/android/contacts/common/res/values-hu/strings.xml
+++ b/java/com/android/contacts/common/res/values-hu/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Nincs a gépnél"</string>
     <string name="status_busy" msgid="5990832098713248503">"Elfoglalt"</string>
     <string name="contactsList" msgid="8806067891419291513">"Címtár"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Legjobb javaslatok"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Egyéb"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Címtár"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Munkahelyi névjegyek címtára"</string>
     <string name="local_search_label" msgid="907622822323119235">"Összes névjegy"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Javaslatok"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Én"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Keresés…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Több mint <xliff:g id="COUNT">%d</xliff:g> találat."</string>
diff --git a/java/com/android/contacts/common/res/values-hy/strings.xml b/java/com/android/contacts/common/res/values-hy/strings.xml
index b3ed5e5..b1490c7 100644
--- a/java/com/android/contacts/common/res/values-hy/strings.xml
+++ b/java/com/android/contacts/common/res/values-hy/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Տեղում չէ"</string>
     <string name="status_busy" msgid="5990832098713248503">"Զբաղված"</string>
     <string name="contactsList" msgid="8806067891419291513">"Կոնտակտներ"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Լավագույն առաջարկներ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Այլ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Գրացուցակ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Աշխատանքային գրացուցակ"</string>
     <string name="local_search_label" msgid="907622822323119235">"Բոլոր կոնտակտները"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Առաջարկներ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ես"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Որոնում..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Գտնվել են <xliff:g id="COUNT">%d</xliff:g>-ից ավելի:"</string>
diff --git a/java/com/android/contacts/common/res/values-in/strings.xml b/java/com/android/contacts/common/res/values-in/strings.xml
index 13252a5..a54821e 100644
--- a/java/com/android/contacts/common/res/values-in/strings.xml
+++ b/java/com/android/contacts/common/res/values-in/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Keluar"</string>
     <string name="status_busy" msgid="5990832098713248503">"Sibuk"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontak"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Paling Disarankan"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Lainnya"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktori"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Direktori kerja"</string>
     <string name="local_search_label" msgid="907622822323119235">"Semua kontak"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Saran"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Saya"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Menelusuri…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Ditemukan lebih dari <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-is/strings.xml b/java/com/android/contacts/common/res/values-is/strings.xml
index 569c10f..803a44b 100644
--- a/java/com/android/contacts/common/res/values-is/strings.xml
+++ b/java/com/android/contacts/common/res/values-is/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Í burtu"</string>
     <string name="status_busy" msgid="5990832098713248503">"Upptekin(n)"</string>
     <string name="contactsList" msgid="8806067891419291513">"Tengiliðir"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Helstu tillögur"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Annað"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Skrá"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Vinnuskrá"</string>
     <string name="local_search_label" msgid="907622822323119235">"Allir tengiliðir"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Tillögur"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ég"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Leitar…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Yfir <xliff:g id="COUNT">%d</xliff:g> fundust."</string>
diff --git a/java/com/android/contacts/common/res/values-it/strings.xml b/java/com/android/contacts/common/res/values-it/strings.xml
index 342cd61..1c4c769 100644
--- a/java/com/android/contacts/common/res/values-it/strings.xml
+++ b/java/com/android/contacts/common/res/values-it/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Assente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Occupato"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contatti"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Suggerimenti più popolari"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Altro"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directory di lavoro"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tutti i contatti"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggerimenti"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Io"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Ricerca..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Più di <xliff:g id="COUNT">%d</xliff:g> trovati."</string>
diff --git a/java/com/android/contacts/common/res/values-iw/strings.xml b/java/com/android/contacts/common/res/values-iw/strings.xml
index e0d8e5d..9f1fd49 100644
--- a/java/com/android/contacts/common/res/values-iw/strings.xml
+++ b/java/com/android/contacts/common/res/values-iw/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"לא נמצא"</string>
     <string name="status_busy" msgid="5990832098713248503">"לא פנוי"</string>
     <string name="contactsList" msgid="8806067891419291513">"אנשי קשר"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"הצעות מובילות"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"אחר"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ספריה"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ספריית עבודה"</string>
     <string name="local_search_label" msgid="907622822323119235">"כל אנשי הקשר"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"הצעות"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"אני"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"מחפש..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"נמצאו יותר מ-<xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-ja/strings.xml b/java/com/android/contacts/common/res/values-ja/strings.xml
index e224a38..8dd7768 100644
--- a/java/com/android/contacts/common/res/values-ja/strings.xml
+++ b/java/com/android/contacts/common/res/values-ja/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"不在"</string>
     <string name="status_busy" msgid="5990832098713248503">"取り込み中"</string>
     <string name="contactsList" msgid="8806067891419291513">"連絡先"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"おすすめ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"その他"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ディレクトリ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"仕事用の連絡先リスト"</string>
     <string name="local_search_label" msgid="907622822323119235">"すべての連絡先"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"候補"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"自分"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"検索中..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>件以上見つかりました。"</string>
diff --git a/java/com/android/contacts/common/res/values-ka/strings.xml b/java/com/android/contacts/common/res/values-ka/strings.xml
index 86273b3..a7f536d 100644
--- a/java/com/android/contacts/common/res/values-ka/strings.xml
+++ b/java/com/android/contacts/common/res/values-ka/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"გასული"</string>
     <string name="status_busy" msgid="5990832098713248503">"დაკავებული"</string>
     <string name="contactsList" msgid="8806067891419291513">"კონტაქტები"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"საუკეთესო შეთავაზებები"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"სხვა"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"კატალოგი"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"სამსახურის კატალოგი"</string>
     <string name="local_search_label" msgid="907622822323119235">"ყველა კონტაქტი"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"შეთავაზებები"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"მე"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"ძიება..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"ნაპოვნია <xliff:g id="COUNT">%d</xliff:g>-ზე მეტი."</string>
diff --git a/java/com/android/contacts/common/res/values-kk/strings.xml b/java/com/android/contacts/common/res/values-kk/strings.xml
index 45df334..cf2f5f1 100644
--- a/java/com/android/contacts/common/res/values-kk/strings.xml
+++ b/java/com/android/contacts/common/res/values-kk/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Желіден тыс"</string>
     <string name="status_busy" msgid="5990832098713248503">"Бос емес"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контактілер"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Үздік ұсыныстар"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Басқа"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Анықтама"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Жұмыс каталогы"</string>
     <string name="local_search_label" msgid="907622822323119235">"Барлық контактілер"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Ұсыныстар"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Мен"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Іздеуде…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> көбірек табылды."</string>
diff --git a/java/com/android/contacts/common/res/values-km/strings.xml b/java/com/android/contacts/common/res/values-km/strings.xml
index 8d4ba2a..d22ebb2 100644
--- a/java/com/android/contacts/common/res/values-km/strings.xml
+++ b/java/com/android/contacts/common/res/values-km/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"ចាក​ឆ្ងាយ"</string>
     <string name="status_busy" msgid="5990832098713248503">"រវល់"</string>
     <string name="contactsList" msgid="8806067891419291513">"ទំនាក់ទំនង"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"បាន​ណែនាំ​​កម្រិត​ខ្ពស់"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ផ្សេងៗ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ថត"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ថតកន្លែងការងារ"</string>
     <string name="local_search_label" msgid="907622822323119235">"ទំនាក់ទំនង​ទាំងអស់"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ការ​ណែនាំ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ខ្ញុំ"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"កំពុង​ស្វែងរក..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"បាន​រក​ឃើញ​ច្រើន​ជាង <xliff:g id="COUNT">%d</xliff:g> ។"</string>
diff --git a/java/com/android/contacts/common/res/values-kn/strings.xml b/java/com/android/contacts/common/res/values-kn/strings.xml
index 0dfdaa6..6b49a0b 100644
--- a/java/com/android/contacts/common/res/values-kn/strings.xml
+++ b/java/com/android/contacts/common/res/values-kn/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"ದೂರ"</string>
     <string name="status_busy" msgid="5990832098713248503">"ಕಾರ್ಯನಿರತ"</string>
     <string name="contactsList" msgid="8806067891419291513">"ಸಂಪರ್ಕಗಳು"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ಉನ್ನತ ಸಲಹೆ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ಇತರೆ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ಡೈರೆಕ್ಟರಿ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ಕೆಲಸದ ಡೈರೆಕ್ಟರಿ"</string>
     <string name="local_search_label" msgid="907622822323119235">"ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ಸಲಹೆಗಳು"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ನಾನು"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"ಹುಡುಕಲಾಗುತ್ತಿದೆ…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ಗಿಂತ ಹೆಚ್ಚಾಗಿ ಕಂಡುಬಂದಿದೆ."</string>
diff --git a/java/com/android/contacts/common/res/values-ko/strings.xml b/java/com/android/contacts/common/res/values-ko/strings.xml
index 13edcc1..f186596 100644
--- a/java/com/android/contacts/common/res/values-ko/strings.xml
+++ b/java/com/android/contacts/common/res/values-ko/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"자리 비움"</string>
     <string name="status_busy" msgid="5990832098713248503">"다른 용무 중"</string>
     <string name="contactsList" msgid="8806067891419291513">"주소록"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"인기 추천"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"기타"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"디렉토리"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"직장 디렉토리"</string>
     <string name="local_search_label" msgid="907622822323119235">"모든 연락처"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"추천"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"나"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"검색 중..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>개 이상 찾았습니다."</string>
diff --git a/java/com/android/contacts/common/res/values-ky/strings.xml b/java/com/android/contacts/common/res/values-ky/strings.xml
index 43e12e7..eaa7dcc 100644
--- a/java/com/android/contacts/common/res/values-ky/strings.xml
+++ b/java/com/android/contacts/common/res/values-ky/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Чыгып кетти"</string>
     <string name="status_busy" msgid="5990832098713248503">"Бош эмес"</string>
     <string name="contactsList" msgid="8806067891419291513">"Байланыштар"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Эң көп сунушталгандар"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Башка"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Директорий"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Жумуш профилиндеги байланыштар китепчеси"</string>
     <string name="local_search_label" msgid="907622822323119235">"Бардык байланыштар"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Сунуштар"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Мен"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Изделүүдө…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ашык табылды."</string>
diff --git a/java/com/android/contacts/common/res/values-lo/strings.xml b/java/com/android/contacts/common/res/values-lo/strings.xml
index d98ec8b..fa6d3c6 100644
--- a/java/com/android/contacts/common/res/values-lo/strings.xml
+++ b/java/com/android/contacts/common/res/values-lo/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"ບໍ່ຢູ່"</string>
     <string name="status_busy" msgid="5990832098713248503">"ບໍ່ຫວ່າງ"</string>
     <string name="contactsList" msgid="8806067891419291513">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ແນະນຳຫຼາຍທີ່ສຸດ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ອື່ນໆ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ໄດເຣັກທໍຣີ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ໄດເຣັກທໍຣີບ່ອນເຮັດວຽກ"</string>
     <string name="local_search_label" msgid="907622822323119235">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທັງໝົດ"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ຄຳແນະນຳ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ຂ້ອຍ"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"ກຳລັງຊອກຫາ..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"ພົບຫຼາຍກວ່າ <xliff:g id="COUNT">%d</xliff:g> ລາຍການ."</string>
diff --git a/java/com/android/contacts/common/res/values-lt/strings.xml b/java/com/android/contacts/common/res/values-lt/strings.xml
index 53773b2..b577260 100644
--- a/java/com/android/contacts/common/res/values-lt/strings.xml
+++ b/java/com/android/contacts/common/res/values-lt/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Pasišalinęs"</string>
     <string name="status_busy" msgid="5990832098713248503">"Užsiėmęs"</string>
     <string name="contactsList" msgid="8806067891419291513">"Adresinė"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Populiariausi siūlomi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Kita"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalogas"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Darbo katalogas"</string>
     <string name="local_search_label" msgid="907622822323119235">"Visi kontaktai"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Pasiūlymai"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Aš"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Ieškoma…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Rasta daugiau nei <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-lv/strings.xml b/java/com/android/contacts/common/res/values-lv/strings.xml
index cc56901..81551e2 100644
--- a/java/com/android/contacts/common/res/values-lv/strings.xml
+++ b/java/com/android/contacts/common/res/values-lv/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Prombūtnē"</string>
     <string name="status_busy" msgid="5990832098713248503">"Aizņemts"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktpersonas"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Populārākie ieteikumi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Cits"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalogs"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Darba katalogs"</string>
     <string name="local_search_label" msgid="907622822323119235">"Visas kontaktpersonas"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Ieteikumi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Es"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Notiek meklēšana…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Atrastas vairāk nekā <xliff:g id="COUNT">%d</xliff:g> kontaktpersonas."</string>
diff --git a/java/com/android/contacts/common/res/values-mk/strings.xml b/java/com/android/contacts/common/res/values-mk/strings.xml
index f6a4af8..475ea17 100644
--- a/java/com/android/contacts/common/res/values-mk/strings.xml
+++ b/java/com/android/contacts/common/res/values-mk/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Отсутен"</string>
     <string name="status_busy" msgid="5990832098713248503">"Зафатен"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Нејдобри предложени"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Друг"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Адресар"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Работен директориум"</string>
     <string name="local_search_label" msgid="907622822323119235">"Сите контакти"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Предлози"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Јас"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Се пребарува..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Повеќе од <xliff:g id="COUNT">%d</xliff:g> се пронајдени."</string>
diff --git a/java/com/android/contacts/common/res/values-ml/strings.xml b/java/com/android/contacts/common/res/values-ml/strings.xml
index dfc21ff..969a99b 100644
--- a/java/com/android/contacts/common/res/values-ml/strings.xml
+++ b/java/com/android/contacts/common/res/values-ml/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"ലഭ്യമല്ല"</string>
     <string name="status_busy" msgid="5990832098713248503">"തിരക്കിലാണ്"</string>
     <string name="contactsList" msgid="8806067891419291513">"കോണ്ടാക്റ്റ്"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"കൂടുതൽ നിർദ്ദേശിച്ചിരിക്കുന്നവ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"മറ്റുള്ളവ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ഡയറക്‌ടറി"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ഔദ്യോഗിക ഡയറക്‌ടറി"</string>
     <string name="local_search_label" msgid="907622822323119235">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"നിര്‍ദ്ദേശങ്ങള്‍"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ഞാന്‍"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"തിരയുന്നു…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>-ൽ കൂടുതൽ കണ്ടെത്തി."</string>
diff --git a/java/com/android/contacts/common/res/values-mn/strings.xml b/java/com/android/contacts/common/res/values-mn/strings.xml
index a5c2afd..12fba53 100644
--- a/java/com/android/contacts/common/res/values-mn/strings.xml
+++ b/java/com/android/contacts/common/res/values-mn/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Холдсон"</string>
     <string name="status_busy" msgid="5990832098713248503">"Завгүй"</string>
     <string name="contactsList" msgid="8806067891419291513">"Харилцагчид"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Санал болгосон шилдэг"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Бусад"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Директор"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Ажлын лавлагаа"</string>
     <string name="local_search_label" msgid="907622822323119235">"Бүх харилцагчид"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Санал болголт"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Би"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Хайж байна..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>-с олон олдлоо."</string>
diff --git a/java/com/android/contacts/common/res/values-mr/strings.xml b/java/com/android/contacts/common/res/values-mr/strings.xml
index d632bb1..8770f8b 100644
--- a/java/com/android/contacts/common/res/values-mr/strings.xml
+++ b/java/com/android/contacts/common/res/values-mr/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"दूर आहे"</string>
     <string name="status_busy" msgid="5990832098713248503">"व्यस्त"</string>
     <string name="contactsList" msgid="8806067891419291513">"संपर्क"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"सुचविलेले उत्कृष्ट"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"इतर"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"निर्देशिका"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"कार्य निर्देशिका"</string>
     <string name="local_search_label" msgid="907622822323119235">"सर्व संपर्क"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"सूचना"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"मी"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"शोधत आहे..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> पेक्षा जास्त आढळले."</string>
diff --git a/java/com/android/contacts/common/res/values-ms/strings.xml b/java/com/android/contacts/common/res/values-ms/strings.xml
index 24ff737..45c297f 100644
--- a/java/com/android/contacts/common/res/values-ms/strings.xml
+++ b/java/com/android/contacts/common/res/values-ms/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Tiada"</string>
     <string name="status_busy" msgid="5990832098713248503">"Sibuk"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kenalan"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Teratas Dicadangkan"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Lain-lain"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktori"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Direktori kerja"</string>
     <string name="local_search_label" msgid="907622822323119235">"Semua kenalan"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Cadangan"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Saya"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Mencari..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"lebih daripada <xliff:g id="COUNT">%d</xliff:g> ditemui"</string>
diff --git a/java/com/android/contacts/common/res/values-my/strings.xml b/java/com/android/contacts/common/res/values-my/strings.xml
index c0cb020..6fbad16 100644
--- a/java/com/android/contacts/common/res/values-my/strings.xml
+++ b/java/com/android/contacts/common/res/values-my/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"အဝေးရောက်နေပါသည်"</string>
     <string name="status_busy" msgid="5990832098713248503">"အလုပ်များနေသည်"</string>
     <string name="contactsList" msgid="8806067891419291513">"အဆက်အသွယ်များ"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ထိပ်တန်း အကြံပြုထားပါသည်"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"တစ်ခြား"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"လမ်းညွှန်"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"အလုပ်လမ်းညွှန်"</string>
     <string name="local_search_label" msgid="907622822323119235">"လိပ်စာများအားလုံး"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"အကြံပြုချက်များ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ကျွန်ုပ်"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"ရှာဖွေနေသည်…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ထက်ပိုတွေ့ရှိသည်"</string>
diff --git a/java/com/android/contacts/common/res/values-nb/strings.xml b/java/com/android/contacts/common/res/values-nb/strings.xml
index 80507fc..8162ee7 100644
--- a/java/com/android/contacts/common/res/values-nb/strings.xml
+++ b/java/com/android/contacts/common/res/values-nb/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Borte"</string>
     <string name="status_busy" msgid="5990832098713248503">"Opptatt"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Toppforslag"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Annen"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Jobbkatalog"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle kontakter"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Forslag"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Meg"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Søker …"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Fant mer enn <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-ne/strings.xml b/java/com/android/contacts/common/res/values-ne/strings.xml
index 2459c8a..0034852 100644
--- a/java/com/android/contacts/common/res/values-ne/strings.xml
+++ b/java/com/android/contacts/common/res/values-ne/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"टाढा"</string>
     <string name="status_busy" msgid="5990832098713248503">"व्यस्त"</string>
     <string name="contactsList" msgid="8806067891419291513">"सम्पर्क"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"सबैभन्दा धेरै सुझाव दिइएको"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"अन्य"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"निर्देशिका"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"कार्यको निर्देशिका"</string>
     <string name="local_search_label" msgid="907622822323119235">"सबै सम्पर्कहरू"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"सुझावहरू"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"म"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"खोजी गर्दै..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>भन्दा बढी पाइयो।"</string>
diff --git a/java/com/android/contacts/common/res/values-nl/strings.xml b/java/com/android/contacts/common/res/values-nl/strings.xml
index c92249b..e8f1b15 100644
--- a/java/com/android/contacts/common/res/values-nl/strings.xml
+++ b/java/com/android/contacts/common/res/values-nl/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Niet beschikbaar"</string>
     <string name="status_busy" msgid="5990832098713248503">"Bezet"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacten"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Populaire suggesties"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Overig"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Zakelijke contactenlijst"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle contacten"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggesties"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ik"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Zoeken..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Meer dan <xliff:g id="COUNT">%d</xliff:g> gevonden."</string>
diff --git a/java/com/android/contacts/common/res/values-no/strings.xml b/java/com/android/contacts/common/res/values-no/strings.xml
index 80507fc..8162ee7 100644
--- a/java/com/android/contacts/common/res/values-no/strings.xml
+++ b/java/com/android/contacts/common/res/values-no/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Borte"</string>
     <string name="status_busy" msgid="5990832098713248503">"Opptatt"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Toppforslag"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Annen"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Jobbkatalog"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle kontakter"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Forslag"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Meg"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Søker …"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Fant mer enn <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-pa/strings.xml b/java/com/android/contacts/common/res/values-pa/strings.xml
index 6401993..8a1a134 100644
--- a/java/com/android/contacts/common/res/values-pa/strings.xml
+++ b/java/com/android/contacts/common/res/values-pa/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"ਦੂਰ"</string>
     <string name="status_busy" msgid="5990832098713248503">"ਰੁੱਝਾ ਹੋਇਆ ਹੈ"</string>
     <string name="contactsList" msgid="8806067891419291513">"ਸੰਪਰਕ"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ਪ੍ਰਮੁੱਖ ਸੁਝਾਏ ਗਏ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ਹੋਰ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ਡਾਇਰੈਕਟਰੀ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ਕੰਮ ਡਾਇਰੈਕਟਰੀ"</string>
     <string name="local_search_label" msgid="907622822323119235">"ਸਾਰੇ ਸੰਪਰਕ"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ਸੁਝਾਅ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ਮੈਂ"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"ਖੋਜ ਰਿਹਾ ਹੈ..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ਤੋਂ ਵੱਧ ਮਿਲੇ।"</string>
diff --git a/java/com/android/contacts/common/res/values-pl/strings.xml b/java/com/android/contacts/common/res/values-pl/strings.xml
index c10bb1f..37d5b62 100644
--- a/java/com/android/contacts/common/res/values-pl/strings.xml
+++ b/java/com/android/contacts/common/res/values-pl/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Nieobecny"</string>
     <string name="status_busy" msgid="5990832098713248503">"Zajęty"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakty"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najlepsze sugestie"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Inny"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Katalog służbowy"</string>
     <string name="local_search_label" msgid="907622822323119235">"Wszystkie kontakty"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestie"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Wyszukiwanie..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Znaleziono więcej niż <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-pt-rBR/strings.xml b/java/com/android/contacts/common/res/values-pt-rBR/strings.xml
index 95bbb0b..5083c4a 100644
--- a/java/com/android/contacts/common/res/values-pt-rBR/strings.xml
+++ b/java/com/android/contacts/common/res/values-pt-rBR/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contatos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Principais sugestões"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Outros"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Diretório"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Diretório de trabalho"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos os contatos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestões"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Pesquisando..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Mais de <xliff:g id="COUNT">%d</xliff:g> encontrados."</string>
diff --git a/java/com/android/contacts/common/res/values-pt-rPT/strings.xml b/java/com/android/contacts/common/res/values-pt-rPT/strings.xml
index c3b50e0..298b7a2 100644
--- a/java/com/android/contacts/common/res/values-pt-rPT/strings.xml
+++ b/java/com/android/contacts/common/res/values-pt-rPT/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado(a)"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Principais sugestões"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Outro"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Diretório"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Diretório de trabalho"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos os contactos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestões"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"A pesquisar..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Foram encontrados mais de <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-pt/strings.xml b/java/com/android/contacts/common/res/values-pt/strings.xml
index 95bbb0b..5083c4a 100644
--- a/java/com/android/contacts/common/res/values-pt/strings.xml
+++ b/java/com/android/contacts/common/res/values-pt/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contatos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Principais sugestões"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Outros"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Diretório"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Diretório de trabalho"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos os contatos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestões"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Pesquisando..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Mais de <xliff:g id="COUNT">%d</xliff:g> encontrados."</string>
diff --git a/java/com/android/contacts/common/res/values-ro/strings.xml b/java/com/android/contacts/common/res/values-ro/strings.xml
index da0d5da..2fd5e5b 100644
--- a/java/com/android/contacts/common/res/values-ro/strings.xml
+++ b/java/com/android/contacts/common/res/values-ro/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Plecat(ă)"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupat(ă)"</string>
     <string name="contactsList" msgid="8806067891419291513">"Agendă"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Cele mai populare sugestii"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Altul"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Director"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directorul de serviciu"</string>
     <string name="local_search_label" msgid="907622822323119235">"Toată agenda"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestii"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Se caută…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"S-au găsit peste <xliff:g id="COUNT">%d</xliff:g> persoane de contact."</string>
diff --git a/java/com/android/contacts/common/res/values-ru/strings.xml b/java/com/android/contacts/common/res/values-ru/strings.xml
index f4e1d84..530732e 100644
--- a/java/com/android/contacts/common/res/values-ru/strings.xml
+++ b/java/com/android/contacts/common/res/values-ru/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Отсутствует"</string>
     <string name="status_busy" msgid="5990832098713248503">"Не беспокоить"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контакты"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Топ рекомендуемых"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Другое"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Каталог"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Каталог контактов из рабочего профиля"</string>
     <string name="local_search_label" msgid="907622822323119235">"Все контакты"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Рекомендуемые"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Вы"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Поиск…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Найдено контактов: более <xliff:g id="COUNT">%d</xliff:g>"</string>
diff --git a/java/com/android/contacts/common/res/values-si/strings.xml b/java/com/android/contacts/common/res/values-si/strings.xml
index fc121f6..1bd9063 100644
--- a/java/com/android/contacts/common/res/values-si/strings.xml
+++ b/java/com/android/contacts/common/res/values-si/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"ළඟ නැත"</string>
     <string name="status_busy" msgid="5990832098713248503">"කාර්යබහුල"</string>
     <string name="contactsList" msgid="8806067891419291513">"සම්බන්ධතා"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ඉහළින්ම යෝජිත"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"වෙනත්"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"නාමාවලිය"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"කාර්යාල සම්බන්ධතා නාමාවලිය"</string>
     <string name="local_search_label" msgid="907622822323119235">"සියලුම සම්බන්ධතා"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"යෝජනා"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"මම"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"සොයමින්..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ට වඩා සොයාගන්නා ලදී."</string>
diff --git a/java/com/android/contacts/common/res/values-sk/strings.xml b/java/com/android/contacts/common/res/values-sk/strings.xml
index 90a4752..59d666e 100644
--- a/java/com/android/contacts/common/res/values-sk/strings.xml
+++ b/java/com/android/contacts/common/res/values-sk/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Som preč"</string>
     <string name="status_busy" msgid="5990832098713248503">"Nemám čas"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakty"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najviac odporúčané"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Iné"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Adresár"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Pracovný adresár"</string>
     <string name="local_search_label" msgid="907622822323119235">"Všetky kontakty"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Návrhy"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Hľadá sa…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Našlo sa viac ako <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-sl/strings.xml b/java/com/android/contacts/common/res/values-sl/strings.xml
index ef2e1a3..dc6e690 100644
--- a/java/com/android/contacts/common/res/values-sl/strings.xml
+++ b/java/com/android/contacts/common/res/values-sl/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Odsoten"</string>
     <string name="status_busy" msgid="5990832098713248503">"Zaseden"</string>
     <string name="contactsList" msgid="8806067891419291513">"Stiki"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najboljši predlogi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Drugo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Imenik"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Delovni imenik"</string>
     <string name="local_search_label" msgid="907622822323119235">"Vsi stiki"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Predlogi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Jaz"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Iskanje ..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Najdenih je bilo več kot toliko stikov: <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-sq/strings.xml b/java/com/android/contacts/common/res/values-sq/strings.xml
index 3011492..64b4388 100644
--- a/java/com/android/contacts/common/res/values-sq/strings.xml
+++ b/java/com/android/contacts/common/res/values-sq/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"I larguar"</string>
     <string name="status_busy" msgid="5990832098713248503">"I zënë"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktet"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Sugjerimet kryesore"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Tjetër"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktoria"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Direktoria e punës"</string>
     <string name="local_search_label" msgid="907622822323119235">"Të gjitha kontaktet"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugjerimet"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Unë"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Po kërkon..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"U gjetën më shumë se <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-sr/strings.xml b/java/com/android/contacts/common/res/values-sr/strings.xml
index 25adf7b..e139662 100644
--- a/java/com/android/contacts/common/res/values-sr/strings.xml
+++ b/java/com/android/contacts/common/res/values-sr/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Одсутан/на"</string>
     <string name="status_busy" msgid="5990832098713248503">"Заузет/а"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Најпопуларнији предлози"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Другo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Директоријум"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Директоријум за Work"</string>
     <string name="local_search_label" msgid="907622822323119235">"Сви контакти"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Предлози"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ја"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Претражује се…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Пронађено је више од <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-sv/strings.xml b/java/com/android/contacts/common/res/values-sv/strings.xml
index ee748a4..cd09517 100644
--- a/java/com/android/contacts/common/res/values-sv/strings.xml
+++ b/java/com/android/contacts/common/res/values-sv/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Borta"</string>
     <string name="status_busy" msgid="5990832098713248503">"Upptagen"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Bästa förslagen"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Övrigt"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Jobbkatalog"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alla kontakter"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Förslag"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Jag"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Söker…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Fler än <xliff:g id="COUNT">%d</xliff:g> hittades."</string>
diff --git a/java/com/android/contacts/common/res/values-sw/strings.xml b/java/com/android/contacts/common/res/values-sw/strings.xml
index 7bd0835..5c41d87 100644
--- a/java/com/android/contacts/common/res/values-sw/strings.xml
+++ b/java/com/android/contacts/common/res/values-sw/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Mbali"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ana shughuli"</string>
     <string name="contactsList" msgid="8806067891419291513">"Anwani"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Mapendekezo Maarufu"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Nyingineyo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Saraka"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Anwani za kazi"</string>
     <string name="local_search_label" msgid="907622822323119235">"Anwani zote"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Mapendekezo"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mimi"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Inatafuta…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Zaidi ya <xliff:g id="COUNT">%d</xliff:g> zimepatikana."</string>
diff --git a/java/com/android/contacts/common/res/values-ta/strings.xml b/java/com/android/contacts/common/res/values-ta/strings.xml
index d5b3f93..df7ee06 100644
--- a/java/com/android/contacts/common/res/values-ta/strings.xml
+++ b/java/com/android/contacts/common/res/values-ta/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"வெளியே"</string>
     <string name="status_busy" msgid="5990832098713248503">"பணிமிகுதி"</string>
     <string name="contactsList" msgid="8806067891419291513">"தொடர்புகள்"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"அதிகம் பரிந்துரைத்தவை"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"மற்றவை"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"கோப்பகம்"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"பணிக் கோப்பகம்"</string>
     <string name="local_search_label" msgid="907622822323119235">"எல்லா தொடர்புகளும்"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"பரிந்துரைகள்"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"எனக்கு"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"தேடுகிறது..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> க்கும் மேற்பட்டவை கண்டறியப்பட்டன."</string>
diff --git a/java/com/android/contacts/common/res/values-te/strings.xml b/java/com/android/contacts/common/res/values-te/strings.xml
index 4126ddc..c97cded 100644
--- a/java/com/android/contacts/common/res/values-te/strings.xml
+++ b/java/com/android/contacts/common/res/values-te/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"దూరంగా ఉన్నారు"</string>
     <string name="status_busy" msgid="5990832098713248503">"బిజీగా ఉన్నారు"</string>
     <string name="contactsList" msgid="8806067891419291513">"పరిచయాలు"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ఉత్తమ సూచనలు"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ఇతరం"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"డైరెక్టరీ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"కార్యాలయ డైరెక్టరీ"</string>
     <string name="local_search_label" msgid="907622822323119235">"అన్ని పరిచయాలు"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"సూచనలు"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"నేను"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"శోధిస్తోంది..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> కంటే ఎక్కువ కనుగొనబడ్డాయి."</string>
diff --git a/java/com/android/contacts/common/res/values-th/strings.xml b/java/com/android/contacts/common/res/values-th/strings.xml
index 2d52f34..aff4a9c 100644
--- a/java/com/android/contacts/common/res/values-th/strings.xml
+++ b/java/com/android/contacts/common/res/values-th/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"ไม่อยู่"</string>
     <string name="status_busy" msgid="5990832098713248503">"ไม่ว่าง"</string>
     <string name="contactsList" msgid="8806067891419291513">"รายชื่อติดต่อ"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"รายการแนะนำยอดนิยม"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"อื่นๆ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ไดเรกทอรี"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ไดเรกทอรีที่ทำงาน"</string>
     <string name="local_search_label" msgid="907622822323119235">"รายชื่อติดต่อทั้งหมด"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"รายการแนะนำ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ฉัน"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"กำลังค้นหา…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"พบมากกว่า <xliff:g id="COUNT">%d</xliff:g> รายการ"</string>
diff --git a/java/com/android/contacts/common/res/values-tl/strings.xml b/java/com/android/contacts/common/res/values-tl/strings.xml
index 30978db..edf2caf 100644
--- a/java/com/android/contacts/common/res/values-tl/strings.xml
+++ b/java/com/android/contacts/common/res/values-tl/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Wala"</string>
     <string name="status_busy" msgid="5990832098713248503">"Abala"</string>
     <string name="contactsList" msgid="8806067891419291513">"Mga Contact"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Mga Madalas Imungkahi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Iba pa"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktoryo"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directory sa trabaho"</string>
     <string name="local_search_label" msgid="907622822323119235">"Lahat ng mga contact"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Mga Mungkahi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ako"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Naghahanap…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Higit sa <xliff:g id="COUNT">%d</xliff:g> ang nakita."</string>
diff --git a/java/com/android/contacts/common/res/values-tr/strings.xml b/java/com/android/contacts/common/res/values-tr/strings.xml
index c18097a..9ec983f 100644
--- a/java/com/android/contacts/common/res/values-tr/strings.xml
+++ b/java/com/android/contacts/common/res/values-tr/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Dışarıda"</string>
     <string name="status_busy" msgid="5990832098713248503">"Meşgul"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kişiler"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"En Çok Önerilenler"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Diğer"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Dizin"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"İş dizini"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tüm kişiler"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Öneriler"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ben"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Aranıyor..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> kişiden fazla bulundu."</string>
diff --git a/java/com/android/contacts/common/res/values-uk/strings.xml b/java/com/android/contacts/common/res/values-uk/strings.xml
index 94d09db..6d5d4eb 100644
--- a/java/com/android/contacts/common/res/values-uk/strings.xml
+++ b/java/com/android/contacts/common/res/values-uk/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Не на місці"</string>
     <string name="status_busy" msgid="5990832098713248503">"Не турбувати"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Найкращі пропозиції"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Інші"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Каталог"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Робочі контакти"</string>
     <string name="local_search_label" msgid="907622822323119235">"Усі контакти"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Пропозиції"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Я"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Пошук…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Знайдено понад <xliff:g id="COUNT">%d</xliff:g>."</string>
diff --git a/java/com/android/contacts/common/res/values-ur/strings.xml b/java/com/android/contacts/common/res/values-ur/strings.xml
index 75c761f..79cf833 100644
--- a/java/com/android/contacts/common/res/values-ur/strings.xml
+++ b/java/com/android/contacts/common/res/values-ur/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"دور"</string>
     <string name="status_busy" msgid="5990832098713248503">"مصروف"</string>
     <string name="contactsList" msgid="8806067891419291513">"رابطے"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"سرفہرست تجویز کردہ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"دیگر"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ڈائریکٹری"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"دفتری ڈائرکٹری"</string>
     <string name="local_search_label" msgid="907622822323119235">"سبھی رابطے"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"تجاویز"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"میں"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"تلاش کر رہا ہے…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> سے زیادہ ملے۔"</string>
diff --git a/java/com/android/contacts/common/res/values-uz/strings.xml b/java/com/android/contacts/common/res/values-uz/strings.xml
index 69b07d1..489846f 100644
--- a/java/com/android/contacts/common/res/values-uz/strings.xml
+++ b/java/com/android/contacts/common/res/values-uz/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Tashqarida"</string>
     <string name="status_busy" msgid="5990832098713248503">"Band"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktlar"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Eng faol"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Boshqa"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktoriya"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Ishchi katalogi"</string>
     <string name="local_search_label" msgid="907622822323119235">"Barcha kontaktlar"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Takliflar"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Men"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Qidirilmoqda…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>dan ko‘proq topildi."</string>
diff --git a/java/com/android/contacts/common/res/values-vi/strings.xml b/java/com/android/contacts/common/res/values-vi/strings.xml
index c167573..65a1c65 100644
--- a/java/com/android/contacts/common/res/values-vi/strings.xml
+++ b/java/com/android/contacts/common/res/values-vi/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Đã ra ngoài"</string>
     <string name="status_busy" msgid="5990832098713248503">"Bận"</string>
     <string name="contactsList" msgid="8806067891419291513">"Danh bạ"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Đề xuất hàng đầu"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Khác"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Thư mục"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Thư mục công việc"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tất cả liên hệ"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Đề xuất"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Tôi"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Đang tìm kiếm…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Đã tìm thấy hơn <xliff:g id="COUNT">%d</xliff:g> người liên hệ."</string>
diff --git a/java/com/android/contacts/common/res/values-zh-rCN/strings.xml b/java/com/android/contacts/common/res/values-zh-rCN/strings.xml
index 367b78f..ee44513 100644
--- a/java/com/android/contacts/common/res/values-zh-rCN/strings.xml
+++ b/java/com/android/contacts/common/res/values-zh-rCN/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"离开"</string>
     <string name="status_busy" msgid="5990832098713248503">"忙碌"</string>
     <string name="contactsList" msgid="8806067891419291513">"通讯录"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"常用联系人推荐"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"其他"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"目录"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"工作目录"</string>
     <string name="local_search_label" msgid="907622822323119235">"所有联系人"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"建议"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"我"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"正在搜索..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"找到超过 <xliff:g id="COUNT">%d</xliff:g> 位联系人。"</string>
diff --git a/java/com/android/contacts/common/res/values-zh-rHK/strings.xml b/java/com/android/contacts/common/res/values-zh-rHK/strings.xml
index 733d980..122d0fe 100644
--- a/java/com/android/contacts/common/res/values-zh-rHK/strings.xml
+++ b/java/com/android/contacts/common/res/values-zh-rHK/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"離開"</string>
     <string name="status_busy" msgid="5990832098713248503">"忙碌"</string>
     <string name="contactsList" msgid="8806067891419291513">"通訊錄"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"熱門建議"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"其他"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"名錄"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"工作目錄"</string>
     <string name="local_search_label" msgid="907622822323119235">"所有聯絡人"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"建議"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"我"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"正在搜尋..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"找到超過 <xliff:g id="COUNT">%d</xliff:g> 位聯絡人。"</string>
diff --git a/java/com/android/contacts/common/res/values-zh-rTW/strings.xml b/java/com/android/contacts/common/res/values-zh-rTW/strings.xml
index af7843f..64b6105 100644
--- a/java/com/android/contacts/common/res/values-zh-rTW/strings.xml
+++ b/java/com/android/contacts/common/res/values-zh-rTW/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"離開"</string>
     <string name="status_busy" msgid="5990832098713248503">"忙碌"</string>
     <string name="contactsList" msgid="8806067891419291513">"聯絡人"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"常用聯絡人建議"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"其他"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"目錄"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Work 聯絡人目錄"</string>
     <string name="local_search_label" msgid="907622822323119235">"所有聯絡人"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"建議"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"我"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"搜尋中…"</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"找到 <xliff:g id="COUNT">%d</xliff:g> 位以上的聯絡人。"</string>
diff --git a/java/com/android/contacts/common/res/values-zu/strings.xml b/java/com/android/contacts/common/res/values-zu/strings.xml
index 5906ee1..e78a6b3 100644
--- a/java/com/android/contacts/common/res/values-zu/strings.xml
+++ b/java/com/android/contacts/common/res/values-zu/strings.xml
@@ -70,10 +70,12 @@
     <string name="status_away" msgid="2298688367552893953">"Ngiphumile"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ngimatasa"</string>
     <string name="contactsList" msgid="8806067891419291513">"Othi tana nabo"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Okuphezulu okuphakanyisiwe"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Okunye"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Uhla lwemibhalo"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Uhla lwemibhalo lomsebenzi"</string>
     <string name="local_search_label" msgid="907622822323119235">"Bonke othintana nabo"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Iziphakamiso"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mina"</string>
     <string name="search_results_searching" msgid="3710866752172327451">"Iyasesha..."</string>
     <string name="foundTooManyContacts" msgid="3685002426663730799">"Abangaphezu kuka-<xliff:g id="COUNT">%d</xliff:g> abatholakele."</string>
diff --git a/java/com/android/contacts/common/res/values/dimens.xml b/java/com/android/contacts/common/res/values/dimens.xml
index 642eb31..26f095f 100644
--- a/java/com/android/contacts/common/res/values/dimens.xml
+++ b/java/com/android/contacts/common/res/values/dimens.xml
@@ -107,7 +107,7 @@
   <dimen name="tab_selected_underline_height">2dp</dimen>
   <!-- Size of text in tabs. -->
   <dimen name="tab_text_size">14sp</dimen>
-  <dimen name="tab_elevation">2dp</dimen>
+  <dimen name="tab_elevation">0dp</dimen>
   <dimen name="tab_unread_count_background_size">16dp</dimen>
   <dimen name="tab_unread_count_background_radius">2dp</dimen>
   <dimen name="tab_unread_count_margin_left">0dp</dimen>
diff --git a/java/com/android/contacts/common/res/values/strings.xml b/java/com/android/contacts/common/res/values/strings.xml
index 371d5b4..85866f7 100644
--- a/java/com/android/contacts/common/res/values/strings.xml
+++ b/java/com/android/contacts/common/res/values/strings.xml
@@ -143,6 +143,9 @@
   <!-- Directory partition name (also exists in contacts) -->
   <string name="contactsList">Contacts</string>
 
+  <!-- Directory partition name for p13n suggestions -->
+  <string name="contact_suggestions">Top Suggested</string>
+
   <!-- The name of the invisible local contact directory -->
   <string name="local_invisible_directory">Other</string>
 
@@ -155,6 +158,9 @@
   <!-- The label in section header in the contact list for a local contacts [CHAR LIMIT=128] -->
   <string name="local_search_label">All contacts</string>
 
+  <!-- The label in section header in the contact list for a local suggested contacts [CHAR LIMIT=128] -->
+  <string name="local_suggestions_search_label">Suggestions</string>
+
   <!-- String describing the text on the header of the profile contact in the contacts list
        This may be programatically capitalized. [CHAR LIMIT=20] -->
   <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Me</string>
diff --git a/java/com/android/dialer/app/Bindings.java b/java/com/android/dialer/app/Bindings.java
index 2beb401..c8cf27e 100644
--- a/java/com/android/dialer/app/Bindings.java
+++ b/java/com/android/dialer/app/Bindings.java
@@ -17,9 +17,6 @@
 package com.android.dialer.app;
 
 import android.content.Context;
-import com.android.dialer.app.bindings.DialerBindings;
-import com.android.dialer.app.bindings.DialerBindingsFactory;
-import com.android.dialer.app.bindings.DialerBindingsStub;
 import com.android.dialer.app.legacybindings.DialerLegacyBindings;
 import com.android.dialer.app.legacybindings.DialerLegacyBindingsFactory;
 import com.android.dialer.app.legacybindings.DialerLegacyBindingsStub;
@@ -28,28 +25,10 @@
 /** Accessor for the in call UI bindings. */
 public class Bindings {
 
-  private static DialerBindings instance;
   private static DialerLegacyBindings legacyInstance;
 
   private Bindings() {}
 
-  public static DialerBindings get(Context context) {
-    Objects.requireNonNull(context);
-    if (instance != null) {
-      return instance;
-    }
-
-    Context application = context.getApplicationContext();
-    if (application instanceof DialerBindingsFactory) {
-      instance = ((DialerBindingsFactory) application).newDialerBindings();
-    }
-
-    if (instance == null) {
-      instance = new DialerBindingsStub();
-    }
-    return instance;
-  }
-
   public static DialerLegacyBindings getLegacy(Context context) {
     Objects.requireNonNull(context);
     if (legacyInstance != null) {
@@ -67,11 +46,4 @@
     return legacyInstance;
   }
 
-  public static void setForTesting(DialerBindings testInstance) {
-    instance = testInstance;
-  }
-
-  public static void setLegacyBindingForTesting(DialerLegacyBindings testLegacyInstance) {
-    legacyInstance = testLegacyInstance;
-  }
 }
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index b5e6150..527dbff 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -71,10 +71,12 @@
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.animation.AnimationListenerAdapter;
 import com.android.dialer.app.calllog.CallLogActivity;
+import com.android.dialer.app.calllog.CallLogAdapter;
 import com.android.dialer.app.calllog.CallLogFragment;
 import com.android.dialer.app.calllog.CallLogNotificationsService;
 import com.android.dialer.app.dialpad.DialpadFragment;
 import com.android.dialer.app.list.DialtactsPagerAdapter;
+import com.android.dialer.app.list.DialtactsPagerAdapter.TabIndex;
 import com.android.dialer.app.list.DragDropController;
 import com.android.dialer.app.list.ListsFragment;
 import com.android.dialer.app.list.OldSpeedDialFragment;
@@ -91,8 +93,8 @@
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.database.Database;
 import com.android.dialer.database.DialerDatabaseHelper;
 import com.android.dialer.interactions.PhoneNumberInteraction;
@@ -100,21 +102,24 @@
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.main.Main;
+import com.android.dialer.main.MainComponent;
 import com.android.dialer.p13n.inference.P13nRanking;
 import com.android.dialer.p13n.inference.protocol.P13nRanker;
 import com.android.dialer.p13n.inference.protocol.P13nRanker.P13nRefreshCompleteListener;
 import com.android.dialer.p13n.logging.P13nLogger;
 import com.android.dialer.p13n.logging.P13nLogging;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.postcall.PostCall;
 import com.android.dialer.proguard.UsedByReflection;
-import com.android.dialer.searchfragment.NewSearchFragment;
+import com.android.dialer.searchfragment.list.NewSearchFragment;
 import com.android.dialer.simulator.Simulator;
 import com.android.dialer.simulator.SimulatorComponent;
 import com.android.dialer.smartdial.SmartDialNameMatcher;
 import com.android.dialer.smartdial.SmartDialPrefix;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.DialerUtils;
-import com.android.dialer.util.IntentUtil;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.util.TouchPointManager;
 import com.android.dialer.util.TransactionSafeActivity;
@@ -132,6 +137,7 @@
         DialpadFragment.OnDialpadQueryChangedListener,
         OnListFragmentScrolledListener,
         CallLogFragment.HostInterface,
+        CallLogAdapter.OnActionModeStateChangedListener,
         DialpadFragment.HostInterface,
         OldSpeedDialFragment.HostInterface,
         SearchFragment.HostInterface,
@@ -149,6 +155,7 @@
   private static final String ACTION_SHOW_TAB = "ACTION_SHOW_TAB";
   @VisibleForTesting public static final String EXTRA_SHOW_TAB = "EXTRA_SHOW_TAB";
   public static final String EXTRA_CLEAR_NEW_VOICEMAILS = "EXTRA_CLEAR_NEW_VOICEMAILS";
+  private static final String KEY_LAST_TAB = "last_tab";
   private static final String TAG = "DialtactsActivity";
   private static final String KEY_IN_REGULAR_SEARCH_UI = "in_regular_search_ui";
   private static final String KEY_IN_DIALPAD_SEARCH_UI = "in_dialpad_search_ui";
@@ -232,6 +239,9 @@
 
   private P13nLogger mP13nLogger;
   private P13nRanker mP13nRanker;
+  public boolean isMultiSelectModeEnabled;
+
+  private boolean isLastTabEnabled;
 
   AnimationListenerAdapter mSlideInListener =
       new AnimationListenerAdapter() {
@@ -263,6 +273,11 @@
             // no need to do anything here.
             return;
           }
+
+          if (count != 0) {
+            PerformanceReport.recordClick(UiAction.Type.TEXT_CHANGE_WITH_INPUT);
+          }
+
           if (DEBUG) {
             LogUtil.v("DialtactsActivity.onTextChanged", "called with new query: " + newText);
             LogUtil.v("DialtactsActivity.onTextChanged", "previous query: " + mSearchQuery);
@@ -299,6 +314,7 @@
         @Override
         public void onClick(View v) {
           if (!isInSearchUi()) {
+            PerformanceReport.recordClick(UiAction.Type.OPEN_SEARCH);
             mActionBarController.onSearchBoxTapped();
             enterSearchUi(
                 false /* smartDialSearch */, mSearchView.getText().toString(), true /* animate */);
@@ -316,9 +332,13 @@
           if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
             if (TextUtils.isEmpty(mSearchView.getText().toString())) {
               // If the search term is empty, close the search UI.
+              PerformanceReport.recordClick(UiAction.Type.CLOSE_SEARCH_WITH_HIDE_BUTTON);
               maybeExitSearchUi();
             } else {
               // If the search term is not empty, show the dialpad fab.
+              if (!mFloatingActionButtonController.isVisible()) {
+                PerformanceReport.recordClick(UiAction.Type.HIDE_KEYBOARD_IN_SEARCH);
+              }
               showFabInSearchUi();
             }
           }
@@ -365,6 +385,7 @@
     super.onCreate(savedInstanceState);
 
     mFirstLaunch = true;
+    isLastTabEnabled = ConfigProviderBindings.get(this).getBoolean("last_tab_enabled", false);
 
     final Resources resources = getResources();
     mActionBarHeight = resources.getDimensionPixelSize(R.dimen.action_bar_height_large);
@@ -490,6 +511,13 @@
     Trace.beginSection(TAG + " onResume");
     super.onResume();
 
+    // Some calls may not be recorded (eg. from quick contact),
+    // so we should restart recording after these calls. (Recorded call is stopped)
+    PostCall.restartPerformanceRecordingIfARecentCallExist(this);
+    if (!PerformanceReport.isRecording()) {
+      PerformanceReport.startRecording();
+    }
+
     mStateSaved = false;
     if (mFirstLaunch) {
       displayFragment(getIntent());
@@ -552,7 +580,8 @@
       }
 
       if (getIntent().getBooleanExtra(EXTRA_CLEAR_NEW_VOICEMAILS, false)) {
-        CallLogNotificationsService.markNewVoicemailsAsOld(this, null);
+        LogUtil.i("DialtactsActivity.onResume", "clearing all new voicemails");
+        CallLogNotificationsService.markAllNewVoicemailsAsOld(this);
       }
     }
 
@@ -603,6 +632,10 @@
         && !getSystemService(KeyguardManager.class).isKeyguardLocked()) {
       mListsFragment.markMissedCallsAsReadAndRemoveNotifications();
     }
+    DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(this)
+        .edit()
+        .putInt(KEY_LAST_TAB, mListsFragment.getCurrentTabIndex())
+        .apply();
   }
 
   @Override
@@ -676,13 +709,8 @@
   public void onClick(View view) {
     int resId = view.getId();
     if (resId == R.id.floating_action_button) {
-      if (mListsFragment.getCurrentTabIndex() == DialtactsPagerAdapter.TAB_INDEX_ALL_CONTACTS
-          && !mInRegularSearch
-          && !mInDialpadSearch) {
-        DialerUtils.startActivityWithErrorToast(
-            this, IntentUtil.getNewContactIntent(), R.string.add_contact_not_available);
-        Logger.get(this).logImpression(DialerImpression.Type.NEW_CONTACT_FAB);
-      } else if (!mIsDialpadShown) {
+      if (!mIsDialpadShown) {
+        PerformanceReport.recordClick(UiAction.Type.OPEN_DIALPAD);
         mInCallDialpadUp = false;
         showDialpadFragment(true);
         PostCall.closePrompt();
@@ -712,6 +740,7 @@
 
     int resId = item.getItemId();
     if (resId == R.id.menu_history) {
+      PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_HISTORY);
       final Intent intent = new Intent(this, CallLogActivity.class);
       startActivity(intent);
     } else if (resId == R.id.menu_clear_frequents) {
@@ -722,6 +751,9 @@
       handleMenuSettings();
       Logger.get(this).logScreenView(ScreenEvent.Type.SETTINGS, this);
       return true;
+    } else if (resId == R.id.menu_new_ui_launcher_shortcut) {
+      MainComponent.get(this).getMain().createNewUiLauncherShortcut(this);
+      return true;
     }
     return false;
   }
@@ -1020,6 +1052,16 @@
       if (showDialpadChooser && !mDialpadFragment.isVisible()) {
         mInCallDialpadUp = true;
       }
+    } else if (isLastTabEnabled) {
+      @TabIndex
+      int tabIndex =
+          DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(this)
+              .getInt(KEY_LAST_TAB, DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL);
+      // If voicemail tab is saved and its availability changes, we still move to the voicemail tab
+      // but it is quickly removed and shown the contacts tab.
+      if (mListsFragment != null) {
+        mListsFragment.showTab(tabIndex);
+      }
     }
   }
 
@@ -1195,6 +1237,8 @@
 
   @Override
   public void onBackPressed() {
+    PerformanceReport.recordClick(UiAction.Type.PRESS_ANDROID_BACK_BUTTON);
+
     if (mStateSaved) {
       return;
     }
@@ -1279,6 +1323,7 @@
     if (mInDialpadSearch
         && mSmartDialSearchFragment != null
         && !mSmartDialSearchFragment.isShowingPermissionRequest()) {
+      PerformanceReport.recordClick(UiAction.Type.CLOSE_DIALPAD);
       hideDialpadFragment(true /* animate */, true /* clearDialpad */);
       return true;
     }
@@ -1287,6 +1332,7 @@
 
   @Override
   public void onListFragmentScrollStateChange(int scrollState) {
+    PerformanceReport.recordScrollStateChange(scrollState);
     if (scrollState == OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
       hideDialpadFragment(true, false);
       DialerUtils.hideInputMethod(mParentLayout);
@@ -1413,18 +1459,6 @@
     int tabIndex = mListsFragment.getCurrentTabIndex();
     mPreviouslySelectedTabIndex = tabIndex;
     mFloatingActionButtonController.setVisible(true);
-    if (tabIndex == DialtactsPagerAdapter.TAB_INDEX_ALL_CONTACTS
-        && !mInRegularSearch
-        && !mInDialpadSearch) {
-      mFloatingActionButtonController.changeIcon(
-          getResources().getDrawable(R.drawable.quantum_ic_person_add_white_24, null),
-          getResources().getString(R.string.search_shortcut_create_new_contact));
-    } else {
-      mFloatingActionButtonController.changeIcon(
-          getResources().getDrawable(R.drawable.quantum_ic_dialpad_white_24, null),
-          getResources().getString(R.string.action_menu_dialpad_button));
-    }
-
     timeTabSelected = SystemClock.elapsedRealtime();
   }
 
@@ -1509,6 +1543,16 @@
             Arrays.toString(grantResults)));
   }
 
+  @Override
+  public void onActionModeStateChanged(boolean isEnabled) {
+    isMultiSelectModeEnabled = isEnabled;
+  }
+
+  @Override
+  public boolean isActionModeStateEnabled() {
+    return isMultiSelectModeEnabled;
+  }
+
   /** Popup menu accessible from the search bar */
   protected class OptionsPopupMenu extends PopupMenu {
 
@@ -1538,6 +1582,10 @@
         simulatorMenuItem.setVisible(false);
       }
 
+      Main dialtacts = MainComponent.get(context).getMain();
+      menu.findItem(R.id.menu_new_ui_launcher_shortcut)
+          .setVisible(dialtacts.isNewUiEnabled(context));
+
       super.show();
     }
   }
diff --git a/java/com/android/dialer/app/bindings/DialerBindingsFactory.java b/java/com/android/dialer/app/bindings/DialerBindingsFactory.java
deleted file mode 100644
index 9f209f9..0000000
--- a/java/com/android/dialer/app/bindings/DialerBindingsFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-package com.android.dialer.app.bindings;
-
-/**
- * This interface should be implementated by the Application subclass. It allows the dialer module
- * to get references to the DialerBindings.
- */
-public interface DialerBindingsFactory {
-
-  DialerBindings newDialerBindings();
-}
diff --git a/java/com/android/dialer/app/bindings/DialerBindingsStub.java b/java/com/android/dialer/app/bindings/DialerBindingsStub.java
deleted file mode 100644
index f56743f..0000000
--- a/java/com/android/dialer/app/bindings/DialerBindingsStub.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2016 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
- */
-
-package com.android.dialer.app.bindings;
-
-import com.android.dialer.common.ConfigProvider;
-
-/** Default implementation for dialer bindings. */
-public class DialerBindingsStub implements DialerBindings {
-  private ConfigProvider configProvider;
-
-  @Override
-  public ConfigProvider getConfigProvider() {
-    if (configProvider == null) {
-      configProvider =
-          new ConfigProvider() {
-            @Override
-            public String getString(String key, String defaultValue) {
-              return defaultValue;
-            }
-
-            @Override
-            public long getLong(String key, long defaultValue) {
-              return defaultValue;
-            }
-
-            @Override
-            public boolean getBoolean(String key, boolean defaultValue) {
-              return defaultValue;
-            }
-          };
-    }
-    return configProvider;
-  }
-}
diff --git a/java/com/android/dialer/app/calllog/CallLogActivity.java b/java/com/android/dialer/app/calllog/CallLogActivity.java
index 443171d..6433af9 100644
--- a/java/com/android/dialer/app/calllog/CallLogActivity.java
+++ b/java/com/android/dialer/app/calllog/CallLogActivity.java
@@ -34,6 +34,9 @@
 import com.android.dialer.database.CallLogQueryHandler;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
+import com.android.dialer.postcall.PostCall;
 import com.android.dialer.util.TransactionSafeActivity;
 import com.android.dialer.util.ViewUtil;
 
@@ -48,7 +51,6 @@
   private ViewPagerTabs mViewPagerTabs;
   private ViewPagerAdapter mViewPagerAdapter;
   private CallLogFragment mAllCallsFragment;
-  private CallLogFragment mMissedCallsFragment;
   private String[] mTabTitles;
   private boolean mIsResumed;
 
@@ -93,9 +95,16 @@
 
   @Override
   protected void onResume() {
+    // Some calls may not be recorded (eg. from quick contact),
+    // so we should restart recording after these calls. (Recorded call is stopped)
+    PostCall.restartPerformanceRecordingIfARecentCallExist(this);
+    if (!PerformanceReport.isRecording()) {
+      PerformanceReport.startRecording();
+    }
+
     mIsResumed = true;
     super.onResume();
-    sendScreenViewForChildFragment(mViewPager.getCurrentItem());
+    sendScreenViewForChildFragment();
   }
 
   @Override
@@ -129,6 +138,7 @@
     }
 
     if (item.getItemId() == android.R.id.home) {
+      PerformanceReport.recordClick(UiAction.Type.CLOSE_CALL_HISTORY_WITH_CANCEL_BUTTON);
       final Intent intent = new Intent(this, DialtactsActivity.class);
       intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
       startActivity(intent);
@@ -148,7 +158,7 @@
   @Override
   public void onPageSelected(int position) {
     if (mIsResumed) {
-      sendScreenViewForChildFragment(position);
+      sendScreenViewForChildFragment();
     }
     mViewPagerTabs.onPageSelected(position);
   }
@@ -158,7 +168,7 @@
     mViewPagerTabs.onPageScrollStateChanged(state);
   }
 
-  private void sendScreenViewForChildFragment(int position) {
+  private void sendScreenViewForChildFragment() {
     Logger.get(this).logScreenView(ScreenEvent.Type.CALL_LOG_FILTER, this);
   }
 
@@ -169,6 +179,12 @@
     return position;
   }
 
+  @Override
+  public void onBackPressed() {
+    PerformanceReport.recordClick(UiAction.Type.PRESS_ANDROID_BACK_BUTTON);
+    super.onBackPressed();
+  }
+
   /** Adapter for the view pager. */
   public class ViewPagerAdapter extends FragmentPagerAdapter {
 
@@ -189,20 +205,16 @@
               CallLogQueryHandler.CALL_TYPE_ALL, true /* isCallLogActivity */);
         case TAB_INDEX_MISSED:
           return new CallLogFragment(Calls.MISSED_TYPE, true /* isCallLogActivity */);
+        default:
+          throw new IllegalStateException("No fragment at position " + position);
       }
-      throw new IllegalStateException("No fragment at position " + position);
     }
 
     @Override
     public Object instantiateItem(ViewGroup container, int position) {
       final CallLogFragment fragment = (CallLogFragment) super.instantiateItem(container, position);
-      switch (position) {
-        case TAB_INDEX_ALL:
+      if (position == TAB_INDEX_ALL) {
           mAllCallsFragment = fragment;
-          break;
-        case TAB_INDEX_MISSED:
-          mMissedCallsFragment = fragment;
-          break;
       }
       return fragment;
     }
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index 3357ee2..f1d051a 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.content.ContentUris;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
@@ -52,7 +53,6 @@
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.dialer.app.Bindings;
 import com.android.dialer.app.DialtactsActivity;
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogGroupBuilder.GroupCreator;
@@ -66,10 +66,10 @@
 import com.android.dialer.calllogutils.PhoneAccountUtils;
 import com.android.dialer.calllogutils.PhoneCallDetails;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.AsyncTaskExecutor;
 import com.android.dialer.common.concurrent.AsyncTaskExecutors;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
@@ -80,6 +80,8 @@
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.phonenumbercache.CallLogQuery;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
@@ -119,6 +121,7 @@
   protected final CallLogCache mCallLogCache;
 
   private final CallFetcher mCallFetcher;
+  private final OnActionModeStateChangedListener mActionModeStateChangedListener;
   private final MultiSelectRemoveView mMultiSelectRemoveView;
   @NonNull private final FilteredNumberAsyncQueryHandler mFilteredNumberAsyncQueryHandler;
   private final int mActivityType;
@@ -159,6 +162,7 @@
           MenuInflater inflater = mode.getMenuInflater();
           inflater.inflate(R.menu.actionbar_delete, menu);
           mMultiSelectRemoveView.showMultiSelectRemoveView(true);
+          mActionModeStateChangedListener.onActionModeStateChanged(true);
           return true;
         }
 
@@ -173,6 +177,7 @@
         @Override
         public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
           if (item.getItemId() == R.id.action_bar_delete_menu_item) {
+            Logger.get(mActivity).logImpression(DialerImpression.Type.MULTISELECT_TAP_DELETE_ICON);
             if (selectedItems.size() > 0) {
               showDeleteSelectedItemsDialog();
             }
@@ -195,52 +200,68 @@
           selectAllMode = false;
           deselectAllMode = false;
           mMultiSelectRemoveView.showMultiSelectRemoveView(false);
+          mActionModeStateChangedListener.onActionModeStateChanged(false);
           notifyDataSetChanged();
         }
       };
 
-  // Todo (uabdullah): Use plurals http://b/37751831
   private void showDeleteSelectedItemsDialog() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
-    Assert.checkArgument(selectedItems.size() > 0);
-    String voicemailString =
-        selectedItems.size() == 1
-            ? mActivity.getResources().getString(R.string.voicemailMultiSelectVoicemail)
-            : mActivity.getResources().getString(R.string.voicemailMultiSelectVoicemails);
-    String deleteVoicemailTitle =
-        mActivity
-            .getResources()
-            .getString(R.string.voicemailMultiSelectDialogTitle, voicemailString);
     SparseArray<String> voicemailsToDeleteOnConfirmation = selectedItems.clone();
-    builder.setTitle(deleteVoicemailTitle);
-
-    builder.setPositiveButton(
-        mActivity.getResources().getString(R.string.voicemailMultiSelectDeleteConfirm),
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int id) {
-            deleteSelectedItems(voicemailsToDeleteOnConfirmation);
-            mActionMode.finish();
-            dialog.cancel();
-          }
-        });
-
-    builder.setNegativeButton(
-        mActivity.getResources().getString(R.string.voicemailMultiSelectDeleteCancel),
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int id) {
-            dialog.cancel();
-          }
-        });
-
-    AlertDialog dialog = builder.create();
-    dialog.show();
+    new AlertDialog.Builder(mActivity, R.style.AlertDialogCustom)
+        .setCancelable(true)
+        .setTitle(
+            mActivity
+                .getResources()
+                .getQuantityString(
+                    R.plurals.delete_voicemails_confirmation_dialog_title, selectedItems.size()))
+        .setPositiveButton(
+            R.string.voicemailMultiSelectDeleteConfirm,
+            new DialogInterface.OnClickListener() {
+              @Override
+              public void onClick(final DialogInterface dialog, final int button) {
+                LogUtil.i(
+                    "CallLogAdapter.showDeleteSelectedItemsDialog",
+                    "onClick, these items to delete " + voicemailsToDeleteOnConfirmation);
+                deleteSelectedItems(voicemailsToDeleteOnConfirmation);
+                mActionMode.finish();
+                dialog.cancel();
+                Logger.get(mActivity)
+                    .logImpression(
+                        DialerImpression.Type.MULTISELECT_DELETE_ENTRY_VIA_CONFIRMATION_DIALOG);
+              }
+            })
+        .setOnCancelListener(
+            new OnCancelListener() {
+              @Override
+              public void onCancel(DialogInterface dialogInterface) {
+                Logger.get(mActivity)
+                    .logImpression(
+                        DialerImpression.Type
+                            .MULTISELECT_CANCEL_CONFIRMATION_DIALOG_VIA_CANCEL_TOUCH);
+                dialogInterface.cancel();
+              }
+            })
+        .setNegativeButton(
+            R.string.voicemailMultiSelectDeleteCancel,
+            new DialogInterface.OnClickListener() {
+              @Override
+              public void onClick(final DialogInterface dialog, final int button) {
+                Logger.get(mActivity)
+                    .logImpression(
+                        DialerImpression.Type
+                            .MULTISELECT_CANCEL_CONFIRMATION_DIALOG_VIA_CANCEL_BUTTON);
+                dialog.cancel();
+              }
+            })
+        .show();
+    Logger.get(mActivity)
+        .logImpression(DialerImpression.Type.MULTISELECT_DISPLAY_DELETE_CONFIRMATION_DIALOG);
   }
 
   private void deleteSelectedItems(SparseArray<String> voicemailsToDelete) {
     for (int i = 0; i < voicemailsToDelete.size(); i++) {
       String voicemailUri = voicemailsToDelete.get(voicemailsToDelete.keyAt(i));
+      LogUtil.i("CallLogAdapter.deleteSelectedItems", "deleting uri:" + voicemailUri);
       CallLogAsyncTaskUtil.deleteVoicemail(mActivity, Uri.parse(voicemailUri), null);
     }
   }
@@ -254,8 +275,13 @@
               && mVoicemailPlaybackPresenter != null) {
             if (v.getId() == R.id.primary_action_view || v.getId() == R.id.quick_contact_photo) {
               if (mActionMode == null) {
+                Logger.get(mActivity)
+                    .logImpression(
+                        DialerImpression.Type.MULTISELECT_LONG_PRESS_ENTER_MULTI_SELECT_MODE);
                 mActionMode = v.startActionMode(mActionModeCallback);
               }
+              Logger.get(mActivity)
+                  .logImpression(DialerImpression.Type.MULTISELECT_LONG_PRESS_TAP_ENTRY);
               CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) v.getTag();
               viewHolder.quickContactView.setVisibility(View.GONE);
               viewHolder.checkBoxView.setVisibility(View.VISIBLE);
@@ -272,6 +298,8 @@
       new View.OnClickListener() {
         @Override
         public void onClick(View v) {
+          PerformanceReport.recordClick(UiAction.Type.CLICK_CALL_LOG_ITEM);
+
           CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) v.getTag();
           if (viewHolder == null) {
             return;
@@ -282,8 +310,12 @@
             mMultiSelectRemoveView.setSelectAllModeToFalse();
             int id = getVoicemailId(viewHolder.voicemailUri);
             if (selectedItems.get(id) != null) {
+              Logger.get(mActivity)
+                  .logImpression(DialerImpression.Type.MULTISELECT_SINGLE_PRESS_UNSELECT_ENTRY);
               uncheckMarkCallLogEntry(viewHolder, id);
             } else {
+              Logger.get(mActivity)
+                  .logImpression(DialerImpression.Type.MULTISELECT_SINGLE_PRESS_SELECT_ENTRY);
               checkMarkCallLogEntry(viewHolder);
             }
             return;
@@ -343,6 +375,8 @@
 
   private void updateActionBar() {
     if (mActionMode == null && selectedItems.size() > 0) {
+      Logger.get(mActivity)
+          .logImpression(DialerImpression.Type.MULTISELECT_ROTATE_AND_SHOW_ACTION_MODE);
       mActivity.startActionMode(mActionModeCallback);
     }
     if (mActionMode != null) {
@@ -413,6 +447,7 @@
       ViewGroup alertContainer,
       CallFetcher callFetcher,
       MultiSelectRemoveView multiSelectRemoveView,
+      OnActionModeStateChangedListener actionModeStateChangedListener,
       CallLogCache callLogCache,
       ContactInfoCache contactInfoCache,
       VoicemailPlaybackPresenter voicemailPlaybackPresenter,
@@ -422,6 +457,7 @@
 
     mActivity = activity;
     mCallFetcher = callFetcher;
+    mActionModeStateChangedListener = actionModeStateChangedListener;
     mMultiSelectRemoveView = multiSelectRemoveView;
     mVoicemailPlaybackPresenter = voicemailPlaybackPresenter;
     if (mVoicemailPlaybackPresenter != null) {
@@ -484,12 +520,23 @@
     outState.putLong(KEY_EXPANDED_ROW_ID, mCurrentlyExpandedRowId);
 
     ArrayList<String> listOfSelectedItems = new ArrayList<>();
+
     if (selectedItems.size() > 0) {
       for (int i = 0; i < selectedItems.size(); i++) {
-        listOfSelectedItems.add(Integer.toString(selectedItems.keyAt(i)));
+        int id = selectedItems.keyAt(i);
+        String voicemailUri = selectedItems.valueAt(i);
+        LogUtil.i(
+            "CallLogAdapter.onSaveInstanceState", "index %d, id=%d, uri=%s ", i, id, voicemailUri);
+        listOfSelectedItems.add(voicemailUri);
       }
     }
     outState.putStringArrayList(KEY_ACTION_MODE, listOfSelectedItems);
+
+    LogUtil.i(
+        "CallLogAdapter.onSaveInstanceState",
+        "saved: %d, selectedItemsSize:%d",
+        listOfSelectedItems.size(),
+        selectedItems.size());
   }
 
   public void onRestoreInstanceState(Bundle savedInstanceState) {
@@ -498,16 +545,31 @@
           savedInstanceState.getInt(KEY_EXPANDED_POSITION, RecyclerView.NO_POSITION);
       mCurrentlyExpandedRowId =
           savedInstanceState.getLong(KEY_EXPANDED_ROW_ID, NO_EXPANDED_LIST_ITEM);
-
       // Restoring multi selected entries
       ArrayList<String> listOfSelectedItems =
           savedInstanceState.getStringArrayList(KEY_ACTION_MODE);
+      LogUtil.i(
+          "CallLogAdapter.onRestoreInstanceState",
+          "restored selectedItemsList:%d",
+          listOfSelectedItems.size());
+
       if (!listOfSelectedItems.isEmpty()) {
         for (int i = 0; i < listOfSelectedItems.size(); i++) {
-          String voicemailId = listOfSelectedItems.get(i);
-          int id = Integer.parseInt(voicemailId);
-          selectedItems.put(id, voicemailId);
+          String voicemailUri = listOfSelectedItems.get(i);
+          int id = getVoicemailId(voicemailUri);
+          LogUtil.i(
+              "CallLogAdapter.onRestoreInstanceState",
+              "restoring selected index %d, id=%d, uri=%s ",
+              i,
+              id,
+              voicemailUri);
+          selectedItems.put(id, voicemailUri);
         }
+
+        LogUtil.i(
+            "CallLogAdapter.onRestoreInstance",
+            "restored selectedItems %s",
+            selectedItems.toString());
         updateActionBar();
       }
     }
@@ -597,6 +659,7 @@
             mBlockReportSpamListener,
             mExpandCollapseListener,
             mLongPressListener,
+            mActionModeStateChangedListener,
             mCallLogCache,
             mCallLogListItemHelper,
             mVoicemailPlaybackPresenter);
@@ -622,7 +685,7 @@
     Trace.beginSection("onBindViewHolder: " + position);
     switch (getItemViewType(position)) {
       case VIEW_TYPE_ALERT:
-        //Do nothing
+        // Do nothing
         break;
       default:
         bindCallLogListViewHolder(viewHolder, position);
@@ -931,8 +994,7 @@
               details.countryIso,
               details.cachedContactInfo,
               position
-                  < Bindings.get(mActivity)
-                      .getConfigProvider()
+                  < ConfigProviderBindings.get(mActivity)
                       .getLong("number_of_call_to_do_remote_lookup", 5L));
     }
     CharSequence formattedNumber =
@@ -1318,6 +1380,14 @@
     void fetchCalls();
   }
 
+  /** Interface used to allow single tap multi select for contact photos. */
+  public interface OnActionModeStateChangedListener {
+
+    void onActionModeStateChanged(boolean isEnabled);
+
+    boolean isActionModeStateEnabled();
+  }
+
   /** Interface used to hide the fragments. */
   public interface MultiSelectRemoveView {
 
diff --git a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
index a5553d1..10866aa 100644
--- a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
+++ b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
@@ -28,6 +28,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.AsyncTaskExecutor;
 import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import com.android.dialer.util.PermissionsUtil;
@@ -45,6 +46,7 @@
 
   public static void markVoicemailAsRead(
       @NonNull final Context context, @NonNull final Uri voicemailUri) {
+    LogUtil.enterBlock("CallLogAsyncTaskUtil.markVoicemailAsRead, voicemailUri: " + voicemailUri);
     if (sAsyncTaskExecutor == null) {
       initTaskExecutor();
     }
@@ -66,9 +68,7 @@
               uploadVoicemailLocalChangesToServer(context);
             }
 
-            Intent intent = new Intent(context, CallLogNotificationsService.class);
-            intent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_VOICEMAILS_AS_OLD);
-            context.startService(intent);
+            CallLogNotificationsService.markAllNewVoicemailsAsOld(context);
             return null;
           }
         });
diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java
index 1571c1a..b03a4ad 100644
--- a/java/com/android/dialer/app/calllog/CallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/CallLogFragment.java
@@ -35,14 +35,20 @@
 import android.support.annotation.CallSuper;
 import android.support.annotation.Nullable;
 import android.support.v13.app.FragmentCompat;
+import android.support.v13.app.FragmentCompat.OnRequestPermissionsResultCallback;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
 import com.android.dialer.app.Bindings;
 import com.android.dialer.app.R;
+import com.android.dialer.app.calllog.CallLogAdapter.CallFetcher;
+import com.android.dialer.app.calllog.CallLogAdapter.MultiSelectRemoveView;
 import com.android.dialer.app.calllog.calllogcache.CallLogCache;
 import com.android.dialer.app.contactinfo.ContactInfoCache;
 import com.android.dialer.app.contactinfo.ContactInfoCache.OnContactInfoChangedListener;
@@ -53,37 +59,44 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.database.CallLogQueryHandler;
+import com.android.dialer.database.CallLogQueryHandler.Listener;
 import com.android.dialer.location.GeoUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.oem.CequintCallerIdManager;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.widget.EmptyContentView;
 import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.util.Arrays;
 
 /**
  * Displays a list of call log entries. To filter for a particular kind of call (all, missed or
  * voicemails), specify it in the constructor.
  */
 public class CallLogFragment extends Fragment
-    implements CallLogQueryHandler.Listener,
-        CallLogAdapter.CallFetcher,
-        CallLogAdapter.MultiSelectRemoveView,
+    implements Listener,
+        CallFetcher,
+        MultiSelectRemoveView,
         OnEmptyViewActionButtonClickedListener,
-        FragmentCompat.OnRequestPermissionsResultCallback,
-        CallLogModalAlertManager.Listener {
+        OnRequestPermissionsResultCallback,
+        CallLogModalAlertManager.Listener,
+        OnClickListener {
   private static final String KEY_FILTER_TYPE = "filter_type";
   private static final String KEY_LOG_LIMIT = "log_limit";
   private static final String KEY_DATE_LIMIT = "date_limit";
   private static final String KEY_IS_CALL_LOG_ACTIVITY = "is_call_log_activity";
   private static final String KEY_HAS_READ_CALL_LOG_PERMISSION = "has_read_call_log_permission";
   private static final String KEY_REFRESH_DATA_REQUIRED = "refresh_data_required";
+  private static final String KEY_SELECT_ALL_MODE = "select_all_mode_checked";
 
   // No limit specified for the number of logs to show; use the CallLogQueryHandler's default.
   private static final int NO_LOG_LIMIT = -1;
   // No date-based filtering.
   private static final int NO_DATE_LIMIT = 0;
 
-  private static final int READ_CALL_LOG_PERMISSION_REQUEST_CODE = 1;
+  private static final int PHONE_PERMISSIONS_REQUEST_CODE = 1;
 
   private static final int EVENT_UPDATE_DISPLAY = 1;
 
@@ -92,6 +105,9 @@
   // See issue 6363009
   private final ContentObserver mCallLogObserver = new CustomContentObserver();
   private final ContentObserver mContactsObserver = new CustomContentObserver();
+  private View mMultiSelectUnSelectAllViewContent;
+  private TextView mSelectUnselectAllViewText;
+  private ImageView mSelectUnselectAllIcon;
   private RecyclerView mRecyclerView;
   private LinearLayoutManager mLayoutManager;
   private CallLogAdapter mAdapter;
@@ -125,6 +141,7 @@
    * True if this instance of the CallLogFragment shown in the CallLogActivity.
    */
   private boolean mIsCallLogActivity = false;
+  private boolean selectAllMode;
   private final Handler mDisplayUpdateHandler =
       new Handler() {
         @Override
@@ -196,6 +213,7 @@
       mIsCallLogActivity = state.getBoolean(KEY_IS_CALL_LOG_ACTIVITY, mIsCallLogActivity);
       mHasReadCallLogPermission = state.getBoolean(KEY_HAS_READ_CALL_LOG_PERMISSION, false);
       mRefreshDataRequired = state.getBoolean(KEY_REFRESH_DATA_REQUIRED, mRefreshDataRequired);
+      selectAllMode = state.getBoolean(KEY_SELECT_ALL_MODE, false);
     }
 
     final Activity activity = getActivity();
@@ -292,12 +310,20 @@
     mRecyclerView.setHasFixedSize(true);
     mLayoutManager = new LinearLayoutManager(getActivity());
     mRecyclerView.setLayoutManager(mLayoutManager);
+    PerformanceReport.logOnScrollStateChange(mRecyclerView);
     mEmptyListView = (EmptyContentView) view.findViewById(R.id.empty_list_view);
     mEmptyListView.setImage(R.drawable.empty_call_log);
     mEmptyListView.setActionClickedListener(this);
     mModalAlertView = (ViewGroup) view.findViewById(R.id.modal_message_container);
     mModalAlertManager =
         new CallLogModalAlertManager(LayoutInflater.from(getContext()), mModalAlertView, this);
+    mMultiSelectUnSelectAllViewContent =
+        view.findViewById(R.id.multi_select_select_all_view_content);
+    mSelectUnselectAllViewText = (TextView) view.findViewById(R.id.select_all_view_text);
+    mSelectUnselectAllIcon = (ImageView) view.findViewById(R.id.select_all_view_icon);
+    mMultiSelectUnSelectAllViewContent.setOnClickListener(null);
+    mSelectUnselectAllIcon.setOnClickListener(this);
+    mSelectUnselectAllViewText.setOnClickListener(this);
   }
 
   protected void setupData() {
@@ -320,6 +346,9 @@
                 mRecyclerView,
                 this,
                 this,
+                activityType == CallLogAdapter.ACTIVITY_TYPE_DIALTACTS
+                    ? (CallLogAdapter.OnActionModeStateChangedListener) getActivity()
+                    : null,
                 CallLogCache.getCallLogCache(getActivity()),
                 mContactInfoCache,
                 getVoicemailPlaybackPresenter(),
@@ -338,9 +367,18 @@
   public void onActivityCreated(Bundle savedInstanceState) {
     super.onActivityCreated(savedInstanceState);
     setupData();
+    updateSelectAllState(savedInstanceState);
     mAdapter.onRestoreInstanceState(savedInstanceState);
   }
 
+  private void updateSelectAllState(Bundle savedInstanceState) {
+    if (savedInstanceState != null) {
+      if (savedInstanceState.getBoolean(KEY_SELECT_ALL_MODE, false)) {
+        updateSelectAllIcon();
+      }
+    }
+  }
+
   @Override
   public void onViewCreated(View view, Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
@@ -420,7 +458,7 @@
     outState.putBoolean(KEY_IS_CALL_LOG_ACTIVITY, mIsCallLogActivity);
     outState.putBoolean(KEY_HAS_READ_CALL_LOG_PERMISSION, mHasReadCallLogPermission);
     outState.putBoolean(KEY_REFRESH_DATA_REQUIRED, mRefreshDataRequired);
-
+    outState.putBoolean(KEY_SELECT_ALL_MODE, selectAllMode);
     mAdapter.onSaveInstanceState(outState);
   }
 
@@ -518,7 +556,8 @@
     if (mKeyguardManager != null
         && !mKeyguardManager.inKeyguardRestrictedInputMode()
         && mCallTypeFilter == Calls.VOICEMAIL_TYPE) {
-      CallLogNotificationsService.markNewVoicemailsAsOld(getActivity(), null);
+      LogUtil.i("CallLogFragment.updateOnTransition", "clearing all new voicemails");
+      CallLogNotificationsService.markAllNewVoicemailsAsOld(getActivity());
     }
   }
 
@@ -529,9 +568,14 @@
       return;
     }
 
-    if (!PermissionsUtil.hasPermission(activity, READ_CALL_LOG)) {
-      FragmentCompat.requestPermissions(
-          this, new String[] {READ_CALL_LOG}, READ_CALL_LOG_PERMISSION_REQUEST_CODE);
+    String[] deniedPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            getContext(), PermissionsUtil.allPhoneGroupPermissionsUsedInDialer);
+    if (deniedPermissions.length > 0) {
+      LogUtil.i(
+          "CallLogFragment.onEmptyViewActionButtonClicked",
+          "Requesting permissions: " + Arrays.toString(deniedPermissions));
+      FragmentCompat.requestPermissions(this, deniedPermissions, PHONE_PERMISSIONS_REQUEST_CODE);
     } else if (!mIsCallLogActivity) {
       // Show dialpad if we are not in the call log activity.
       ((HostInterface) activity).showDialpad();
@@ -541,7 +585,7 @@
   @Override
   public void onRequestPermissionsResult(
       int requestCode, String[] permissions, int[] grantResults) {
-    if (requestCode == READ_CALL_LOG_PERMISSION_REQUEST_CODE) {
+    if (requestCode == PHONE_PERMISSIONS_REQUEST_CODE) {
       if (grantResults.length >= 1 && PackageManager.PERMISSION_GRANTED == grantResults[0]) {
         // Force a refresh of the data since we were missing the permission before this.
         mRefreshDataRequired = true;
@@ -606,12 +650,40 @@
 
   @Override
   public void showMultiSelectRemoveView(boolean show) {
+    mMultiSelectUnSelectAllViewContent.setVisibility(show ? View.VISIBLE : View.GONE);
+    mMultiSelectUnSelectAllViewContent.setAlpha(show ? 0 : 1);
+    mMultiSelectUnSelectAllViewContent.animate().alpha(show ? 1 : 0).start();
     ((ListsFragment) getParentFragment()).showMultiSelectRemoveView(show);
   }
 
   @Override
   public void setSelectAllModeToFalse() {
-    ((ListsFragment) getParentFragment()).setSelectAllModeToFalse();
+    selectAllMode = false;
+    mSelectUnselectAllIcon.setImageDrawable(
+        getContext().getDrawable(R.drawable.ic_empty_check_mark_white_24dp));
+  }
+
+  @Override
+  public void onClick(View v) {
+    selectAllMode = !selectAllMode;
+    if (selectAllMode) {
+      Logger.get(v.getContext()).logImpression(DialerImpression.Type.MULTISELECT_SELECT_ALL);
+    } else {
+      Logger.get(v.getContext()).logImpression(DialerImpression.Type.MULTISELECT_UNSELECT_ALL);
+    }
+    updateSelectAllIcon();
+  }
+
+  private void updateSelectAllIcon() {
+    if (selectAllMode) {
+      mSelectUnselectAllIcon.setImageDrawable(
+          getContext().getDrawable(R.drawable.ic_check_mark_blue_24dp));
+      getAdapter().onAllSelected();
+    } else {
+      mSelectUnselectAllIcon.setImageDrawable(
+          getContext().getDrawable(R.drawable.ic_empty_check_mark_white_24dp));
+      getAdapter().onAllDeselected();
+    }
   }
 
   public interface HostInterface {
diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
index a9a4d1d..c59f0dd 100644
--- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
+++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
@@ -26,23 +26,25 @@
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
+import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.PhoneNumberUtils;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.view.ContextMenu;
+import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewStub;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.QuickContactBadge;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.android.contacts.common.ClipboardUtils;
@@ -54,6 +56,7 @@
 import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.app.DialtactsActivity;
 import com.android.dialer.app.R;
+import com.android.dialer.app.calllog.CallLogAdapter.OnActionModeStateChangedListener;
 import com.android.dialer.app.calllog.calllogcache.CallLogCache;
 import com.android.dialer.app.voicemail.VoicemailPlaybackLayout;
 import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter;
@@ -61,11 +64,14 @@
 import com.android.dialer.blocking.FilteredNumberCompat;
 import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.callcomposer.CallComposerActivity;
+import com.android.dialer.calldetails.CallDetailsActivity;
 import com.android.dialer.calldetails.CallDetailsEntries;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.dialercontact.SimDetails;
 import com.android.dialer.lightbringer.Lightbringer;
 import com.android.dialer.lightbringer.LightbringerComponent;
 import com.android.dialer.logging.ContactSource;
@@ -73,12 +79,16 @@
 import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.PhoneNumberCache;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.DialerUtils;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * This is an object containing references to views contained by the call log list item. This
@@ -94,7 +104,7 @@
   /** The root view of the call log list item */
   public final View rootView;
   /** The quick contact badge for the contact. */
-  public final QuickContactBadge quickContactView;
+  public final DialerQuickContactBadge quickContactView;
   /** The primary action view of the entry. */
   public final View primaryActionView;
   /** The details of the phone call. */
@@ -112,6 +122,7 @@
   private final CachedNumberLookupService mCachedNumberLookupService;
   private final VoicemailPlaybackPresenter mVoicemailPlaybackPresenter;
   private final OnClickListener mBlockReportListener;
+  @HostUi private final int hostUi;
   /** Whether the data fields are populated by the worker thread, ready to be shown. */
   public boolean isLoaded;
   /** The view containing call log item actions. Null until the ViewStub is inflated. */
@@ -205,6 +216,7 @@
   public boolean lightbringerReady;
 
   private View.OnClickListener mExpandCollapseListener;
+  private final OnActionModeStateChangedListener onActionModeStateChangedListener;
   private final View.OnLongClickListener longPressListener;
   private boolean mVoicemailPrimaryActionButtonClicked;
 
@@ -220,11 +232,12 @@
       OnClickListener blockReportListener,
       View.OnClickListener expandCollapseListener,
       View.OnLongClickListener longClickListener,
+      CallLogAdapter.OnActionModeStateChangedListener actionModeStateChangedListener,
       CallLogCache callLogCache,
       CallLogListItemHelper callLogListItemHelper,
       VoicemailPlaybackPresenter voicemailPlaybackPresenter,
       View rootView,
-      QuickContactBadge quickContactView,
+      DialerQuickContactBadge dialerQuickContactView,
       View primaryActionView,
       PhoneCallDetailsViews phoneCallDetailsViews,
       CardView callLogEntryView,
@@ -234,6 +247,7 @@
 
     mContext = context;
     mExpandCollapseListener = expandCollapseListener;
+    onActionModeStateChangedListener = actionModeStateChangedListener;
     longPressListener = longClickListener;
     mCallLogCache = callLogCache;
     mCallLogListItemHelper = callLogListItemHelper;
@@ -242,7 +256,7 @@
     mCachedNumberLookupService = PhoneNumberCache.get(mContext).getCachedNumberLookupService();
 
     this.rootView = rootView;
-    this.quickContactView = quickContactView;
+    this.quickContactView = dialerQuickContactView;
     this.primaryActionView = primaryActionView;
     this.phoneCallDetailsViews = phoneCallDetailsViews;
     this.callLogEntryView = callLogEntryView;
@@ -256,14 +270,17 @@
     phoneCallDetailsViews.callLocationAndDate.setElegantTextHeight(false);
 
     if (mContext instanceof CallLogActivity) {
+      hostUi = HostUi.CALL_HISTORY;
       Logger.get(mContext)
           .logQuickContactOnTouch(
               quickContactView, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_CALL_HISTORY, true);
     } else if (mVoicemailPlaybackPresenter == null) {
+      hostUi = HostUi.CALL_LOG;
       Logger.get(mContext)
           .logQuickContactOnTouch(
               quickContactView, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_CALL_LOG, true);
     } else {
+      hostUi = HostUi.VOICEMAIL;
       Logger.get(mContext)
           .logQuickContactOnTouch(
               quickContactView, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_VOICEMAIL, false);
@@ -282,6 +299,8 @@
                 CallLogAdapter.ENABLE_CALL_LOG_MULTI_SELECT_FLAG)) {
       primaryActionView.setOnLongClickListener(longPressListener);
       quickContactView.setOnLongClickListener(longPressListener);
+      quickContactView.setMulitSelectListeners(
+          mExpandCollapseListener, onActionModeStateChangedListener);
     } else {
       primaryActionView.setOnCreateContextMenuListener(this);
     }
@@ -293,6 +312,7 @@
       OnClickListener blockReportListener,
       View.OnClickListener expandCollapseListener,
       View.OnLongClickListener longClickListener,
+      CallLogAdapter.OnActionModeStateChangedListener actionModeStateChangeListener,
       CallLogCache callLogCache,
       CallLogListItemHelper callLogListItemHelper,
       VoicemailPlaybackPresenter voicemailPlaybackPresenter) {
@@ -302,11 +322,12 @@
         blockReportListener,
         expandCollapseListener,
         longClickListener,
+        actionModeStateChangeListener,
         callLogCache,
         callLogListItemHelper,
         voicemailPlaybackPresenter,
         view,
-        (QuickContactBadge) view.findViewById(R.id.quick_contact_photo),
+        (DialerQuickContactBadge) view.findViewById(R.id.quick_contact_photo),
         view.findViewById(R.id.primary_action_view),
         PhoneCallDetailsViews.fromView(view),
         (CardView) view.findViewById(R.id.call_log_row),
@@ -315,6 +336,11 @@
   }
 
   public static CallLogListItemViewHolder createForTest(Context context) {
+    return createForTest(context, null);
+  }
+
+  static CallLogListItemViewHolder createForTest(
+      Context context, VoicemailPlaybackPresenter voicemailPlaybackPresenter) {
     Resources resources = context.getResources();
     CallLogCache callLogCache = CallLogCache.getCallLogCache(context);
     PhoneCallDetailsHelper phoneCallDetailsHelper =
@@ -326,11 +352,12 @@
             null,
             null /* expandCollapseListener */,
             null,
+            null,
             callLogCache,
             new CallLogListItemHelper(phoneCallDetailsHelper, resources, callLogCache),
-            null /* voicemailPlaybackPresenter */,
-            new View(context),
-            new QuickContactBadge(context),
+            voicemailPlaybackPresenter,
+            LayoutInflater.from(context).inflate(R.layout.call_log_list_item, null),
+            new DialerQuickContactBadge(context),
             new View(context),
             PhoneCallDetailsViews.createForTest(context),
             new CardView(context),
@@ -474,6 +501,17 @@
       // Treat as normal list item; show call button, if possible.
       if (PhoneNumberHelper.canPlaceCallsTo(number, numberPresentation)) {
         boolean isVoicemailNumber = mCallLogCache.isVoicemailNumber(accountHandle, number);
+
+        if (!isVoicemailNumber && showLightbringerPrimaryButton()) {
+          primaryActionButtonView.setTag(IntentProvider.getLightbringerIntentProvider(number));
+          primaryActionButtonView.setContentDescription(
+              TextUtils.expandTemplate(
+                  mContext.getString(R.string.description_video_call_action), validNameOrNumber));
+          primaryActionButtonView.setImageResource(R.drawable.quantum_ic_videocam_vd_theme_24);
+          primaryActionButtonView.setVisibility(View.VISIBLE);
+          return;
+        }
+
         if (isVoicemailNumber) {
           // Call to generic voicemail number, in case there are multiple accounts.
           primaryActionButtonView.setTag(IntentProvider.getReturnVoicemailCallIntentProvider());
@@ -531,8 +569,15 @@
       return;
     }
 
-    if (!TextUtils.isEmpty(voicemailUri) && canPlaceCallToNumber) {
+    if (canPlaceCallToNumber) {
+      // Set up the call button but hide it by default (the primary action is to call so it is
+      // redundant). We then set it to be visible when appropriate below. This saves us having to
+      // remember to set it to GONE in multiple places.
       callButtonView.setTag(IntentProvider.getReturnCallIntentProvider(number));
+      callButtonView.setVisibility(View.GONE);
+    }
+
+    if (!TextUtils.isEmpty(voicemailUri) && canPlaceCallToNumber) {
       ((TextView) callButtonView.findViewById(R.id.call_action_text))
           .setText(
               TextUtils.expandTemplate(
@@ -547,13 +592,14 @@
         callTypeOrLocationView.setVisibility(View.GONE);
       }
       callButtonView.setVisibility(View.VISIBLE);
-    } else {
-      callButtonView.setVisibility(View.GONE);
     }
 
     if (hasPlacedCarrierVideoCall() || canSupportCarrierVideoCall()) {
       videoCallButtonView.setTag(IntentProvider.getReturnVideoCallIntentProvider(number));
       videoCallButtonView.setVisibility(View.VISIBLE);
+    } else if (showLightbringerPrimaryButton()) {
+      callButtonView.setVisibility(View.VISIBLE);
+      videoCallButtonView.setVisibility(View.GONE);
     } else if (lightbringerReady) {
       videoCallButtonView.setTag(IntentProvider.getLightbringerIntentProvider(number));
       videoCallButtonView.setVisibility(View.VISIBLE);
@@ -585,8 +631,12 @@
       detailsButtonView.setVisibility(View.GONE);
     } else {
       detailsButtonView.setVisibility(View.VISIBLE);
+      boolean canReportCallerId =
+          mCachedNumberLookupService != null
+              && mCachedNumberLookupService.canReportAsInvalid(info.sourceType, info.objectId);
       detailsButtonView.setTag(
-          IntentProvider.getCallDetailIntentProvider(callDetailsEntries, buildContact()));
+          IntentProvider.getCallDetailIntentProvider(
+              callDetailsEntries, buildContact(), canReportCallerId));
     }
 
     boolean isBlockedOrSpam = blockId != null || (isSpamFeatureEnabled && isSpam);
@@ -634,6 +684,12 @@
     return false;
   }
 
+  private boolean showLightbringerPrimaryButton() {
+    return accountHandle != null
+        && accountHandle.getComponentName().equals(getLightbringer().getPhoneAccountComponentName())
+        && lightbringerReady;
+  }
+
   private static boolean hasDialableChar(CharSequence number) {
     if (TextUtils.isEmpty(number)) {
       return false;
@@ -653,9 +709,7 @@
     if (accountHandle == null) {
       return false;
     }
-    if (accountHandle
-        .getComponentName()
-        .equals(getLightbringer().getPhoneAccountComponentName(mContext))) {
+    if (accountHandle.getComponentName().equals(getLightbringer().getPhoneAccountComponentName())) {
       return false;
     }
     return true;
@@ -823,9 +877,14 @@
       // We check to see if we are starting a Lightbringer intent. The reason is Lightbringer
       // intents need to be started using startActivityForResult instead of the usual startActivity
       String packageName = intent.getPackage();
-      if (packageName != null && packageName.equals(getLightbringer().getPackageName(mContext))) {
+      if (getLightbringer().getPackageName().equals(packageName)) {
         startLightbringerActivity(intent);
       } else {
+        if (intent.getComponent() != null
+            && CallDetailsActivity.class.getName().equals(intent.getComponent().getClassName())) {
+          // We are going to open call detail
+          PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_DETAIL);
+        }
         DialerUtils.startActivityWithErrorToast(mContext, intent);
       }
     }
@@ -860,6 +919,19 @@
     }
     /* phone number type (e.g. mobile) in second line of contact view */
     contact.setNumberLabel(numberType);
+
+    /* third line of contact view. */
+    String accountLabel = mCallLogCache.getAccountLabel(accountHandle);
+    if (!TextUtils.isEmpty(accountLabel)) {
+      SimDetails.Builder simDetails = SimDetails.newBuilder().setNetwork(accountLabel);
+      int color = mCallLogCache.getAccountColor(accountHandle);
+      if (color == PhoneAccount.NO_HIGHLIGHT_COLOR) {
+        simDetails.setColor(R.color.secondary_text_color);
+      } else {
+        simDetails.setColor(color);
+      }
+      contact.setSimDetails(simDetails.build());
+    }
     return contact.build();
   }
 
@@ -868,8 +940,38 @@
       Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_SEND_MESSAGE);
     } else if (id == R.id.add_to_existing_contact_action) {
       Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_ADD_TO_CONTACT);
+      switch (hostUi) {
+        case HostUi.CALL_HISTORY:
+          Logger.get(mContext)
+              .logImpression(DialerImpression.Type.ADD_TO_A_CONTACT_FROM_CALL_HISTORY);
+          break;
+        case HostUi.CALL_LOG:
+          Logger.get(mContext).logImpression(DialerImpression.Type.ADD_TO_A_CONTACT_FROM_CALL_LOG);
+          break;
+        case HostUi.VOICEMAIL:
+          Logger.get(mContext).logImpression(DialerImpression.Type.ADD_TO_A_CONTACT_FROM_VOICEMAIL);
+          break;
+        default:
+          throw Assert.createIllegalStateFailException();
+      }
     } else if (id == R.id.create_new_contact_action) {
       Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_CREATE_NEW_CONTACT);
+      switch (hostUi) {
+        case HostUi.CALL_HISTORY:
+          Logger.get(mContext)
+              .logImpression(DialerImpression.Type.CREATE_NEW_CONTACT_FROM_CALL_HISTORY);
+          break;
+        case HostUi.CALL_LOG:
+          Logger.get(mContext)
+              .logImpression(DialerImpression.Type.CREATE_NEW_CONTACT_FROM_CALL_LOG);
+          break;
+        case HostUi.VOICEMAIL:
+          Logger.get(mContext)
+              .logImpression(DialerImpression.Type.CREATE_NEW_CONTACT_FROM_VOICEMAIL);
+          break;
+        default:
+          throw Assert.createIllegalStateFailException();
+      }
     }
   }
 
@@ -1021,6 +1123,15 @@
     Logger.get(mContext).logScreenView(ScreenEvent.Type.CALL_LOG_CONTEXT_MENU, (Activity) mContext);
   }
 
+  /** Specifies where the view holder belongs. */
+  @IntDef({HostUi.CALL_LOG, HostUi.CALL_HISTORY, HostUi.VOICEMAIL})
+  @Retention(RetentionPolicy.SOURCE)
+  private @interface HostUi {
+    int CALL_LOG = 0;
+    int CALL_HISTORY = 1;
+    int VOICEMAIL = 2;
+  }
+
   public interface OnClickListener {
 
     void onBlockReportSpam(
diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java
index e169b8d..43e03e9 100644
--- a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java
+++ b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java
@@ -18,7 +18,6 @@
 
 import android.Manifest;
 import android.annotation.TargetApi;
-import android.app.NotificationManager;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -27,6 +26,7 @@
 import android.net.Uri;
 import android.os.Build.VERSION_CODES;
 import android.provider.CallLog.Calls;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 import android.support.v4.os.UserManagerCompat;
@@ -36,7 +36,6 @@
 import com.android.dialer.calllogutils.PhoneNumberDisplayUtil;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.location.GeoUtil;
-import com.android.dialer.notification.GroupedNotificationUtil;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.util.PermissionsUtil;
@@ -46,7 +45,6 @@
 /** Helper class operating on call log notifications. */
 public class CallLogNotificationsQueryHelper {
 
-  private static final String TAG = "CallLogNotifHelper";
   private final Context mContext;
   private final NewCallsQuery mNewCallsQuery;
   private final ContactInfoHelper mContactInfoHelper;
@@ -74,44 +72,58 @@
         countryIso);
   }
 
+  public static void markAllMissedCallsInCallLogAsRead(@NonNull Context context) {
+    markMissedCallsInCallLogAsRead(context, null);
+  }
+
+  public static void markSingleMissedCallInCallLogAsRead(
+      @NonNull Context context, @Nullable Uri callUri) {
+    if (callUri == null) {
+      LogUtil.e(
+          "CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead",
+          "call URI is null, unable to mark call as read");
+    } else {
+      markMissedCallsInCallLogAsRead(context, callUri);
+    }
+  }
+
   /**
-   * Removes the missed call notifications and marks calls as read. If a callUri is provided, only
-   * that call is marked as read.
+   * If callUri is null then calls with a matching callUri are marked as read, otherwise all calls
+   * are marked as read.
    */
   @WorkerThread
-  public static void removeMissedCallNotifications(Context context, @Nullable Uri callUri) {
-    // Call log is only accessible when unlocked. If that's the case, clear the list of
-    // new missed calls from the call log.
-    if (UserManagerCompat.isUserUnlocked(context) && PermissionsUtil.hasPhonePermissions(context)) {
-      ContentValues values = new ContentValues();
-      values.put(Calls.NEW, 0);
-      values.put(Calls.IS_READ, 1);
-      StringBuilder where = new StringBuilder();
-      where.append(Calls.NEW);
-      where.append(" = 1 AND ");
-      where.append(Calls.TYPE);
-      where.append(" = ?");
-      try {
-        context
-            .getContentResolver()
-            .update(
-                callUri == null ? Calls.CONTENT_URI : callUri,
-                values,
-                where.toString(),
-                new String[] {Integer.toString(Calls.MISSED_TYPE)});
-      } catch (IllegalArgumentException e) {
-        LogUtil.e(
-            "CallLogNotificationsQueryHelper.removeMissedCallNotifications",
-            "contacts provider update command failed",
-            e);
-      }
+  private static void markMissedCallsInCallLogAsRead(Context context, @Nullable Uri callUri) {
+    if (!UserManagerCompat.isUserUnlocked(context)) {
+      LogUtil.e("CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", "locked");
+      return;
+    }
+    if (!PermissionsUtil.hasPhonePermissions(context)) {
+      LogUtil.e("CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", "no permission");
+      return;
     }
 
-    GroupedNotificationUtil.removeNotification(
-        context.getSystemService(NotificationManager.class),
-        callUri != null ? callUri.toString() : null,
-        R.id.notification_missed_call,
-        MissedCallNotifier.NOTIFICATION_TAG);
+    ContentValues values = new ContentValues();
+    values.put(Calls.NEW, 0);
+    values.put(Calls.IS_READ, 1);
+    StringBuilder where = new StringBuilder();
+    where.append(Calls.NEW);
+    where.append(" = 1 AND ");
+    where.append(Calls.TYPE);
+    where.append(" = ?");
+    try {
+      context
+          .getContentResolver()
+          .update(
+              callUri == null ? Calls.CONTENT_URI : callUri,
+              values,
+              where.toString(),
+              new String[] {Integer.toString(Calls.MISSED_TYPE)});
+    } catch (IllegalArgumentException e) {
+      LogUtil.e(
+          "CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead",
+          "contacts provider update command failed",
+          e);
+    }
   }
 
   /** Create a new instance of {@link NewCallsQuery}. */
@@ -281,7 +293,9 @@
     @TargetApi(VERSION_CODES.M)
     public List<NewCall> query(int type) {
       if (!PermissionsUtil.hasPermission(mContext, Manifest.permission.READ_CALL_LOG)) {
-        LogUtil.w(TAG, "No READ_CALL_LOG permission, returning null for calls lookup.");
+        LogUtil.w(
+            "CallLogNotificationsQueryHelper.DefaultNewCallsQuery.query",
+            "no READ_CALL_LOG permission, returning null for calls lookup.");
         return null;
       }
       final String selection = String.format("%s = 1 AND %s = ?", Calls.NEW, Calls.TYPE);
@@ -302,7 +316,9 @@
         }
         return newCalls;
       } catch (RuntimeException e) {
-        LogUtil.w(TAG, "Exception when querying Contacts Provider for calls lookup");
+        LogUtil.w(
+            "CallLogNotificationsQueryHelper.DefaultNewCallsQuery.query",
+            "exception when querying Contacts Provider for calls lookup");
         return null;
       }
     }
diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsService.java b/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
index 7dfd2cb..be1ebfb 100644
--- a/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
+++ b/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
@@ -17,12 +17,13 @@
 package com.android.dialer.app.calllog;
 
 import android.app.IntentService;
+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Handler;
-import android.os.Looper;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.PermissionsUtil;
@@ -43,16 +44,20 @@
  */
 public class CallLogNotificationsService extends IntentService {
 
-  /** Action to mark all the new voicemails as old. */
-  public static final String ACTION_MARK_NEW_VOICEMAILS_AS_OLD =
-      "com.android.dialer.calllog.ACTION_MARK_NEW_VOICEMAILS_AS_OLD";
+  private static final String ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD =
+      "com.android.dialer.calllog.ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD";
 
-  /** Action to mark all the new missed calls as old. */
-  public static final String ACTION_MARK_NEW_MISSED_CALLS_AS_OLD =
-      "com.android.dialer.calllog.ACTION_MARK_NEW_MISSED_CALLS_AS_OLD";
+  private static final String ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD =
+      "com.android.dialer.calllog.ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD ";
 
-  /** Action to update missed call notifications with a post call note. */
-  public static final String ACTION_INCOMING_POST_CALL =
+  @VisibleForTesting
+  static final String ACTION_CANCEL_ALL_MISSED_CALLS =
+      "com.android.dialer.calllog.ACTION_CANCEL_ALL_MISSED_CALLS";
+
+  private static final String ACTION_CANCEL_SINGLE_MISSED_CALL =
+      "com.android.dialer.calllog.ACTION_CANCEL_SINGLE_MISSED_CALL";
+
+  private static final String ACTION_INCOMING_POST_CALL =
       "com.android.dialer.calllog.INCOMING_POST_CALL";
 
   /** Action to call back a missed call. */
@@ -64,7 +69,7 @@
    *
    * <p>It must be a {@link String}
    */
-  public static final String EXTRA_POST_CALL_NOTE = "POST_CALL_NOTE";
+  private static final String EXTRA_POST_CALL_NOTE = "POST_CALL_NOTE";
 
   /**
    * Extra to be included with {@link #ACTION_INCOMING_POST_CALL} to represent the phone number the
@@ -72,10 +77,9 @@
    *
    * <p>It must be a {@link String}
    */
-  public static final String EXTRA_POST_CALL_NUMBER = "POST_CALL_NUMBER";
+  private static final String EXTRA_POST_CALL_NUMBER = "POST_CALL_NUMBER";
 
   public static final int UNKNOWN_MISSED_CALL_COUNT = -1;
-  private VoicemailQueryHandler mVoicemailQueryHandler;
 
   public CallLogNotificationsService() {
     super("CallLogNotificationsService");
@@ -89,52 +93,95 @@
     context.startService(serviceIntent);
   }
 
-  public static void markNewVoicemailsAsOld(Context context, @Nullable Uri voicemailUri) {
+  public static void markAllNewVoicemailsAsOld(Context context) {
+    LogUtil.enterBlock("CallLogNotificationsService.markAllNewVoicemailsAsOld");
     Intent serviceIntent = new Intent(context, CallLogNotificationsService.class);
-    serviceIntent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_VOICEMAILS_AS_OLD);
+    serviceIntent.setAction(CallLogNotificationsService.ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD);
+    context.startService(serviceIntent);
+  }
+
+  public static void markSingleNewVoicemailAsOld(Context context, @Nullable Uri voicemailUri) {
+    LogUtil.enterBlock("CallLogNotificationsService.markSingleNewVoicemailAsOld");
+    Intent serviceIntent = new Intent(context, CallLogNotificationsService.class);
+    serviceIntent.setAction(CallLogNotificationsService.ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD);
     serviceIntent.setData(voicemailUri);
     context.startService(serviceIntent);
   }
 
-  public static void markNewMissedCallsAsOld(Context context, @Nullable Uri callUri) {
+  public static PendingIntent createMarkAllNewVoicemailsAsOldIntent(@NonNull Context context) {
+    Intent intent = new Intent(context, CallLogNotificationsService.class);
+    intent.setAction(CallLogNotificationsService.ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD);
+    return PendingIntent.getService(context, 0, intent, 0);
+  }
+
+  public static PendingIntent createMarkSingleNewVoicemailAsOldIntent(
+      @NonNull Context context, @Nullable Uri voicemailUri) {
+    Intent intent = new Intent(context, CallLogNotificationsService.class);
+    intent.setAction(CallLogNotificationsService.ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD);
+    intent.setData(voicemailUri);
+    return PendingIntent.getService(context, 0, intent, 0);
+  }
+
+  public static void cancelAllMissedCalls(@NonNull Context context) {
+    LogUtil.enterBlock("CallLogNotificationsService.cancelAllMissedCalls");
     Intent serviceIntent = new Intent(context, CallLogNotificationsService.class);
-    serviceIntent.setAction(ACTION_MARK_NEW_MISSED_CALLS_AS_OLD);
-    serviceIntent.setData(callUri);
+    serviceIntent.setAction(ACTION_CANCEL_ALL_MISSED_CALLS);
     context.startService(serviceIntent);
   }
 
+  public static PendingIntent createCancelAllMissedCallsPendingIntent(@NonNull Context context) {
+    Intent intent = new Intent(context, CallLogNotificationsService.class);
+    intent.setAction(ACTION_CANCEL_ALL_MISSED_CALLS);
+    return PendingIntent.getService(context, 0, intent, 0);
+  }
+
+  public static PendingIntent createCancelSingleMissedCallPendingIntent(
+      @NonNull Context context, @Nullable Uri callUri) {
+    Intent intent = new Intent(context, CallLogNotificationsService.class);
+    intent.setAction(ACTION_CANCEL_SINGLE_MISSED_CALL);
+    intent.setData(callUri);
+    return PendingIntent.getService(context, 0, intent, 0);
+  }
+
   @Override
   protected void onHandleIntent(Intent intent) {
     if (intent == null) {
-      LogUtil.d("CallLogNotificationsService.onHandleIntent", "could not handle null intent");
+      LogUtil.e("CallLogNotificationsService.onHandleIntent", "could not handle null intent");
       return;
     }
 
-    if (!PermissionsUtil.hasPermission(this, android.Manifest.permission.READ_CALL_LOG)) {
+    if (!PermissionsUtil.hasPermission(this, android.Manifest.permission.READ_CALL_LOG)
+        || !PermissionsUtil.hasPermission(this, android.Manifest.permission.WRITE_CALL_LOG)) {
+      LogUtil.e("CallLogNotificationsService.onHandleIntent", "no READ_CALL_LOG permission");
       return;
     }
 
     String action = intent.getAction();
+    LogUtil.i("CallLogNotificationsService.onHandleIntent", "action: " + action);
     switch (action) {
-      case ACTION_MARK_NEW_VOICEMAILS_AS_OLD:
-        // VoicemailQueryHandler cannot be created on the IntentService worker thread. The completed
-        // callback might happen when the thread is dead.
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(
-            () -> {
-              if (mVoicemailQueryHandler == null) {
-                mVoicemailQueryHandler = new VoicemailQueryHandler(this, getContentResolver());
-              }
-              mVoicemailQueryHandler.markNewVoicemailsAsOld(intent.getData());
-            });
+      case ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD:
+        VoicemailQueryHandler.markAllNewVoicemailsAsRead(this);
+        VisualVoicemailNotifier.cancelAllVoicemailNotifications(this);
+        break;
+      case ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD:
+        Uri voicemailUri = intent.getData();
+        VoicemailQueryHandler.markSingleNewVoicemailAsRead(this, voicemailUri);
+        VisualVoicemailNotifier.cancelSingleVoicemailNotification(this, voicemailUri);
         break;
       case ACTION_INCOMING_POST_CALL:
         String note = intent.getStringExtra(EXTRA_POST_CALL_NOTE);
         String phoneNumber = intent.getStringExtra(EXTRA_POST_CALL_NUMBER);
         MissedCallNotifier.getIstance(this).insertPostCallNotification(phoneNumber, note);
         break;
-      case ACTION_MARK_NEW_MISSED_CALLS_AS_OLD:
-        CallLogNotificationsQueryHelper.removeMissedCallNotifications(this, intent.getData());
+      case ACTION_CANCEL_ALL_MISSED_CALLS:
+        CallLogNotificationsQueryHelper.markAllMissedCallsInCallLogAsRead(this);
+        MissedCallNotifier.cancelAllMissedCallNotifications(this);
+        TelecomUtil.cancelMissedCallsNotification(this);
+        break;
+      case ACTION_CANCEL_SINGLE_MISSED_CALL:
+        Uri callUri = intent.getData();
+        CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead(this, callUri);
+        MissedCallNotifier.cancelSingleMissedCallNotification(this, callUri);
         TelecomUtil.cancelMissedCallsNotification(this);
         break;
       case ACTION_CALL_BACK_FROM_MISSED_CALL_NOTIFICATION:
@@ -145,7 +192,7 @@
                 intent.getData());
         break;
       default:
-        LogUtil.d("CallLogNotificationsService.onHandleIntent", "could not handle: " + intent);
+        LogUtil.e("CallLogNotificationsService.onHandleIntent", "no handler for action: " + action);
         break;
     }
   }
diff --git a/java/com/android/dialer/app/calllog/CallLogReceiver.java b/java/com/android/dialer/app/calllog/CallLogReceiver.java
index 172d001..ce3132d 100644
--- a/java/com/android/dialer/app/calllog/CallLogReceiver.java
+++ b/java/com/android/dialer/app/calllog/CallLogReceiver.java
@@ -39,10 +39,10 @@
     if (VoicemailContract.ACTION_NEW_VOICEMAIL.equals(intent.getAction())) {
       checkVoicemailStatus(context);
       PendingResult pendingResult = goAsync();
-      DefaultVoicemailNotifier.updateVoicemailNotifications(context, pendingResult::finish);
+      VisualVoicemailUpdateTask.scheduleTask(context, pendingResult::finish);
     } else if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
       PendingResult pendingResult = goAsync();
-      DefaultVoicemailNotifier.updateVoicemailNotifications(context, pendingResult::finish);
+      VisualVoicemailUpdateTask.scheduleTask(context, pendingResult::finish);
     } else {
       LogUtil.w("CallLogReceiver.onReceive", "could not handle: " + intent);
     }
diff --git a/java/com/android/dialer/app/calllog/ClearCallLogDialog.java b/java/com/android/dialer/app/calllog/ClearCallLogDialog.java
index a01b895..155a916 100644
--- a/java/com/android/dialer/app/calllog/ClearCallLogDialog.java
+++ b/java/com/android/dialer/app/calllog/ClearCallLogDialog.java
@@ -54,7 +54,7 @@
                 ProgressDialog.show(
                     getActivity(), getString(R.string.clearCallLogProgress_title), "", true, false);
             progressDialog.setOwnerActivity(getActivity());
-            CallLogNotificationsService.markNewMissedCallsAsOld(getContext(), null);
+            CallLogNotificationsService.cancelAllMissedCalls(getContext());
             final AsyncTask<Void, Void, Void> task =
                 new AsyncTask<Void, Void, Void>() {
                   @Override
diff --git a/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java b/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java
deleted file mode 100644
index 1f45f70..0000000
--- a/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Copyright (C) 2011 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
- */
-
-package com.android.dialer.app.calllog;
-
-import android.annotation.TargetApi;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.os.PersistableBundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.annotation.WorkerThread;
-import android.support.v4.os.BuildCompat;
-import android.support.v4.util.Pair;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
-import android.telephony.CarrierConfigManager;
-import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.ArrayMap;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.dialer.app.DialtactsActivity;
-import com.android.dialer.app.R;
-import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
-import com.android.dialer.app.contactinfo.ContactPhotoLoader;
-import com.android.dialer.app.list.DialtactsPagerAdapter;
-import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
-import com.android.dialer.blocking.FilteredNumbersUtil;
-import com.android.dialer.calllogutils.PhoneAccountUtils;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.common.concurrent.DialerExecutors;
-import com.android.dialer.logging.DialerImpression;
-import com.android.dialer.logging.Logger;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
-import com.android.dialer.phonenumbercache.ContactInfo;
-import com.android.dialer.telecom.TelecomUtil;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/** Shows a voicemail notification in the status bar. */
-public class DefaultVoicemailNotifier implements Worker<Void, Void> {
-
-  public static final String TAG = "VoicemailNotifier";
-
-  /** The tag used to identify notifications from this class. */
-  static final String VISUAL_VOICEMAIL_NOTIFICATION_TAG = "DefaultVoicemailNotifier";
-  /** The identifier of the notification of new voicemails. */
-  private static final int VISUAL_VOICEMAIL_NOTIFICATION_ID = R.id.notification_visual_voicemail;
-
-  private static final int LEGACY_VOICEMAIL_NOTIFICATION_ID = R.id.notification_legacy_voicemail;
-  private static final String LEGACY_VOICEMAIL_NOTIFICATION_TAG = "legacy_voicemail";
-
-  private final Context context;
-  private final CallLogNotificationsQueryHelper queryHelper;
-  private final FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler;
-
-  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-  DefaultVoicemailNotifier(
-      Context context,
-      CallLogNotificationsQueryHelper queryHelper,
-      FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler) {
-    this.context = context;
-    this.queryHelper = queryHelper;
-    this.filteredNumberAsyncQueryHandler = filteredNumberAsyncQueryHandler;
-  }
-
-  public DefaultVoicemailNotifier(Context context) {
-    this(
-        context,
-        CallLogNotificationsQueryHelper.getInstance(context),
-        new FilteredNumberAsyncQueryHandler(context));
-  }
-
-  @Nullable
-  @Override
-  public Void doInBackground(@Nullable Void input) throws Throwable {
-    updateNotification();
-    return null;
-  }
-
-  /**
-   * Updates the notification and notifies of the call with the given URI.
-   *
-   * <p>Clears the notification if there are no new voicemails, and notifies if the given URI
-   * corresponds to a new voicemail.
-   *
-   * <p>It is not safe to call this method from the main thread.
-   */
-  @VisibleForTesting
-  @WorkerThread
-  void updateNotification() {
-    Assert.isWorkerThread();
-    // Lookup the list of new voicemails to include in the notification.
-    final List<NewCall> newCalls = queryHelper.getNewVoicemails();
-
-    if (newCalls == null) {
-      // Query failed, just return.
-      return;
-    }
-
-    Resources resources = context.getResources();
-
-    // This represents a list of names to include in the notification.
-    String callers = null;
-
-    // Maps each number into a name: if a number is in the map, it has already left a more
-    // recent voicemail.
-    final Map<String, ContactInfo> contactInfos = new ArrayMap<>();
-
-    // Iterate over the new voicemails to determine all the information above.
-    Iterator<NewCall> itr = newCalls.iterator();
-    while (itr.hasNext()) {
-      NewCall newCall = itr.next();
-
-      // Skip notifying for numbers which are blocked.
-      if (!FilteredNumbersUtil.hasRecentEmergencyCall(context)
-          && filteredNumberAsyncQueryHandler.getBlockedIdSynchronous(
-                  newCall.number, newCall.countryIso)
-              != null) {
-        itr.remove();
-
-        if (newCall.voicemailUri != null) {
-          // Delete the voicemail.
-          CallLogAsyncTaskUtil.deleteVoicemailSynchronous(context, newCall.voicemailUri);
-        }
-        continue;
-      }
-
-      // Check if we already know the name associated with this number.
-      ContactInfo contactInfo = contactInfos.get(newCall.number);
-      if (contactInfo == null) {
-        contactInfo =
-            queryHelper.getContactInfo(
-                newCall.number, newCall.numberPresentation, newCall.countryIso);
-        contactInfos.put(newCall.number, contactInfo);
-        // This is a new caller. Add it to the back of the list of callers.
-        if (TextUtils.isEmpty(callers)) {
-          callers = contactInfo.name;
-        } else {
-          callers =
-              resources.getString(
-                  R.string.notification_voicemail_callers_list, callers, contactInfo.name);
-        }
-      }
-    }
-
-    if (newCalls.isEmpty()) {
-      // No voicemails to notify about
-      return;
-    }
-
-    Notification.Builder groupSummary =
-        createNotificationBuilder()
-            .setContentTitle(
-                resources.getQuantityString(
-                    R.plurals.notification_voicemail_title, newCalls.size(), newCalls.size()))
-            .setContentText(callers)
-            .setDeleteIntent(createMarkNewVoicemailsAsOldIntent(null))
-            .setGroupSummary(true)
-            .setContentIntent(newVoicemailIntent(null));
-
-    if (BuildCompat.isAtLeastO()) {
-      groupSummary.setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN);
-    }
-
-    NotificationChannelManager.applyChannel(
-        groupSummary,
-        context,
-        Channel.VOICEMAIL,
-        PhoneAccountHandles.getAccount(context, newCalls.get(0)));
-
-    LogUtil.i(TAG, "Creating visual voicemail notification");
-    getNotificationManager()
-        .notify(
-            VISUAL_VOICEMAIL_NOTIFICATION_TAG,
-            VISUAL_VOICEMAIL_NOTIFICATION_ID,
-            groupSummary.build());
-
-    for (NewCall voicemail : newCalls) {
-      getNotificationManager()
-          .notify(
-              voicemail.callsUri.toString(),
-              VISUAL_VOICEMAIL_NOTIFICATION_ID,
-              createNotificationForVoicemail(voicemail, contactInfos));
-    }
-  }
-
-  /**
-   * Replicates how packages/services/Telephony/NotificationMgr.java handles legacy voicemail
-   * notification. The notification will not be stackable because no information is available for
-   * individual voicemails.
-   */
-  @TargetApi(VERSION_CODES.O)
-  public void notifyLegacyVoicemail(
-      @NonNull PhoneAccountHandle phoneAccountHandle,
-      int count,
-      String voicemailNumber,
-      PendingIntent callVoicemailIntent,
-      PendingIntent voicemailSettingIntent,
-      boolean isRefresh) {
-    Assert.isNotNull(phoneAccountHandle);
-    Assert.checkArgument(BuildCompat.isAtLeastO());
-    TelephonyManager telephonyManager =
-        context
-            .getSystemService(TelephonyManager.class)
-            .createForPhoneAccountHandle(phoneAccountHandle);
-    if (telephonyManager == null) {
-      LogUtil.e(TAG, "invalid PhoneAccountHandle, ignoring");
-      return;
-    }
-    LogUtil.i(TAG, "Creating legacy voicemail notification");
-
-    PersistableBundle carrierConfig = telephonyManager.getCarrierConfig();
-
-    String notificationTitle =
-        context
-            .getResources()
-            .getQuantityString(R.plurals.notification_voicemail_title, count, count);
-
-    TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
-    PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
-
-    String notificationText;
-    PendingIntent pendingIntent;
-
-    if (voicemailSettingIntent != null) {
-      // If the voicemail number if unknown, instead of calling voicemail, take the user
-      // to the voicemail settings.
-      notificationText = context.getString(R.string.notification_voicemail_no_vm_number);
-      pendingIntent = voicemailSettingIntent;
-    } else {
-      if (PhoneAccountUtils.getSubscriptionPhoneAccounts(context).size() > 1) {
-        notificationText = phoneAccount.getShortDescription().toString();
-      } else {
-        notificationText =
-            String.format(
-                context.getString(R.string.notification_voicemail_text_format),
-                PhoneNumberUtils.formatNumber(voicemailNumber));
-      }
-      pendingIntent = callVoicemailIntent;
-    }
-    Notification.Builder builder = new Notification.Builder(context);
-    builder
-        .setSmallIcon(android.R.drawable.stat_notify_voicemail)
-        .setColor(context.getColor(R.color.dialer_theme_color))
-        .setWhen(System.currentTimeMillis())
-        .setContentTitle(notificationTitle)
-        .setContentText(notificationText)
-        .setContentIntent(pendingIntent)
-        .setSound(telephonyManager.getVoicemailRingtoneUri(phoneAccountHandle))
-        .setOngoing(
-            carrierConfig.getBoolean(
-                CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL))
-        .setOnlyAlertOnce(isRefresh);
-
-    if (telephonyManager.isVoicemailVibrationEnabled(phoneAccountHandle)) {
-      builder.setDefaults(Notification.DEFAULT_VIBRATE);
-    }
-
-    NotificationChannelManager.applyChannel(
-        builder, context, Channel.VOICEMAIL, phoneAccountHandle);
-    Notification notification = builder.build();
-    getNotificationManager()
-        .notify(LEGACY_VOICEMAIL_NOTIFICATION_TAG, LEGACY_VOICEMAIL_NOTIFICATION_ID, notification);
-  }
-
-  public void cancelLegacyNotification() {
-    LogUtil.i(TAG, "Clearing legacy voicemail notification");
-    getNotificationManager()
-        .cancel(LEGACY_VOICEMAIL_NOTIFICATION_TAG, LEGACY_VOICEMAIL_NOTIFICATION_ID);
-  }
-
-  /**
-   * Determines which ringtone Uri and Notification defaults to use when updating the notification
-   * for the given call.
-   */
-  private Pair<Uri, Integer> getNotificationInfo(@Nullable NewCall callToNotify) {
-    LogUtil.v(TAG, "getNotificationInfo");
-    if (callToNotify == null) {
-      LogUtil.i(TAG, "callToNotify == null");
-      return new Pair<>(null, 0);
-    }
-    PhoneAccountHandle accountHandle = PhoneAccountHandles.getAccount(context, callToNotify);
-    if (accountHandle == null) {
-      LogUtil.i(TAG, "No default phone account found, using default notification ringtone");
-      return new Pair<>(null, Notification.DEFAULT_ALL);
-    }
-    return new Pair<>(
-        TelephonyManagerCompat.getVoicemailRingtoneUri(getTelephonyManager(), accountHandle),
-        getNotificationDefaults(accountHandle));
-  }
-
-  private int getNotificationDefaults(PhoneAccountHandle accountHandle) {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return TelephonyManagerCompat.isVoicemailVibrationEnabled(
-              getTelephonyManager(), accountHandle)
-          ? Notification.DEFAULT_VIBRATE
-          : 0;
-    }
-    return Notification.DEFAULT_ALL;
-  }
-
-  /** Creates a pending intent that marks all new voicemails as old. */
-  private PendingIntent createMarkNewVoicemailsAsOldIntent(@Nullable Uri voicemailUri) {
-    Intent intent = new Intent(context, CallLogNotificationsService.class);
-    intent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_VOICEMAILS_AS_OLD);
-    intent.setData(voicemailUri);
-    return PendingIntent.getService(context, 0, intent, 0);
-  }
-
-  private NotificationManager getNotificationManager() {
-    return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-  }
-
-  private TelephonyManager getTelephonyManager() {
-    return (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-  }
-
-  private Notification createNotificationForVoicemail(
-      @NonNull NewCall voicemail, @NonNull Map<String, ContactInfo> contactInfos) {
-    Pair<Uri, Integer> notificationInfo = getNotificationInfo(voicemail);
-    ContactInfo contactInfo = contactInfos.get(voicemail.number);
-
-    Notification.Builder notificationBuilder =
-        createNotificationBuilder()
-            .setContentTitle(
-                context
-                    .getResources()
-                    .getQuantityString(R.plurals.notification_voicemail_title, 1, 1))
-            .setContentText(
-                ContactDisplayUtils.getTtsSpannedPhoneNumber(
-                    context.getResources(),
-                    R.string.notification_new_voicemail_ticker,
-                    contactInfo.name))
-            .setWhen(voicemail.dateMs)
-            .setSound(notificationInfo.first)
-            .setDefaults(notificationInfo.second);
-
-    if (voicemail.voicemailUri != null) {
-      notificationBuilder.setDeleteIntent(
-          createMarkNewVoicemailsAsOldIntent(voicemail.voicemailUri));
-    }
-
-    NotificationChannelManager.applyChannel(
-        notificationBuilder,
-        context,
-        Channel.VOICEMAIL,
-        PhoneAccountHandles.getAccount(context, voicemail));
-
-    ContactPhotoLoader loader = new ContactPhotoLoader(context, contactInfo);
-    Bitmap photoIcon = loader.loadPhotoIcon();
-    if (photoIcon != null) {
-      notificationBuilder.setLargeIcon(photoIcon);
-    }
-    if (!TextUtils.isEmpty(voicemail.transcription)) {
-      Logger.get(context)
-          .logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED_WITH_TRANSCRIPTION);
-      notificationBuilder.setStyle(
-          new Notification.BigTextStyle().bigText(voicemail.transcription));
-    }
-    notificationBuilder.setContentIntent(newVoicemailIntent(voicemail));
-    Logger.get(context).logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED);
-    return notificationBuilder.build();
-  }
-
-  private Notification.Builder createNotificationBuilder() {
-    return new Notification.Builder(context)
-        .setSmallIcon(android.R.drawable.stat_notify_voicemail)
-        .setColor(context.getColor(R.color.dialer_theme_color))
-        .setGroup(VISUAL_VOICEMAIL_NOTIFICATION_TAG)
-        .setOnlyAlertOnce(true)
-        .setAutoCancel(true);
-  }
-
-  private PendingIntent newVoicemailIntent(@Nullable NewCall voicemail) {
-    Intent intent =
-        DialtactsActivity.getShowTabIntent(context, DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL);
-    // TODO (b/35486204): scroll to this voicemail
-    if (voicemail != null) {
-      intent.setData(voicemail.voicemailUri);
-    }
-    intent.putExtra(DialtactsActivity.EXTRA_CLEAR_NEW_VOICEMAILS, true);
-    return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-  }
-
-  /**
-   * Updates the voicemail notifications displayed.
-   *
-   * @param runnable Called when the async update task completes no matter if it succeeds or fails.
-   *     May be null.
-   */
-  static void updateVoicemailNotifications(Context context, Runnable runnable) {
-    if (!TelecomUtil.isDefaultDialer(context)) {
-      LogUtil.i(
-          "DefaultVoicemailNotifier.updateVoicemailNotifications",
-          "not default dialer, not scheduling update to voicemail notifications");
-      return;
-    }
-
-    DialerExecutors.createNonUiTaskBuilder(new DefaultVoicemailNotifier(context))
-        .onSuccess(
-            output -> {
-              LogUtil.i(
-                  "DefaultVoicemailNotifier.updateVoicemailNotifications",
-                  "update voicemail notifications successful");
-              if (runnable != null) {
-                runnable.run();
-              }
-            })
-        .onFailure(
-            throwable -> {
-              LogUtil.i(
-                  "DefaultVoicemailNotifier.updateVoicemailNotifications",
-                  "update voicemail notifications failed");
-              if (runnable != null) {
-                runnable.run();
-              }
-            })
-        .build()
-        .executeParallel(null);
-  }
-}
diff --git a/java/com/android/dialer/app/calllog/DialerQuickContactBadge.java b/java/com/android/dialer/app/calllog/DialerQuickContactBadge.java
new file mode 100644
index 0000000..a3aac41
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/DialerQuickContactBadge.java
@@ -0,0 +1,63 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.app.calllog;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.QuickContactBadge;
+import com.android.dialer.app.calllog.CallLogAdapter.OnActionModeStateChangedListener;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+
+/** Allows us to click the contact badge for non multi select mode. */
+class DialerQuickContactBadge extends QuickContactBadge {
+
+  private View.OnClickListener mExtraOnClickListener;
+  private OnActionModeStateChangedListener onActionModeStateChangeListener;
+
+  public DialerQuickContactBadge(Context context) {
+    super(context);
+  }
+
+  public DialerQuickContactBadge(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public DialerQuickContactBadge(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (mExtraOnClickListener != null
+        && onActionModeStateChangeListener.isActionModeStateEnabled()) {
+      Logger.get(v.getContext())
+          .logImpression(DialerImpression.Type.MULTISELECT_SINGLE_PRESS_TAP_VIA_CONTACT_BADGE);
+      mExtraOnClickListener.onClick(v);
+    } else {
+      super.onClick(v);
+    }
+  }
+
+  public void setMulitSelectListeners(
+      View.OnClickListener extraOnClickListener,
+      OnActionModeStateChangedListener actionModeStateChangeListener) {
+    mExtraOnClickListener = extraOnClickListener;
+    onActionModeStateChangeListener = actionModeStateChangeListener;
+  }
+}
diff --git a/java/com/android/dialer/app/calllog/IntentProvider.java b/java/com/android/dialer/app/calllog/IntentProvider.java
index 9c3c18b..e1ec9f5 100644
--- a/java/com/android/dialer/app/calllog/IntentProvider.java
+++ b/java/com/android/dialer/app/calllog/IntentProvider.java
@@ -117,11 +117,12 @@
    * @return The call details intent provider.
    */
   public static IntentProvider getCallDetailIntentProvider(
-      CallDetailsEntries callDetailsEntries, DialerContact contact) {
+      CallDetailsEntries callDetailsEntries, DialerContact contact, boolean canReportCallerId) {
     return new IntentProvider() {
       @Override
       public Intent getIntent(Context context) {
-        return CallDetailsActivity.newInstance(context, callDetailsEntries, contact);
+        return CallDetailsActivity.newInstance(
+            context, callDetailsEntries, contact, canReportCallerId);
       }
     };
   }
diff --git a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
new file mode 100644
index 0000000..428c716
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
@@ -0,0 +1,156 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.app.calllog;
+
+import android.annotation.TargetApi;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.os.Build.VERSION_CODES;
+import android.support.annotation.NonNull;
+import android.support.v4.os.BuildCompat;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import com.android.dialer.app.R;
+import com.android.dialer.calllogutils.PhoneAccountUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.notification.NotificationChannelManager;
+
+/** Shows a notification in the status bar for legacy vociemail. */
+@TargetApi(VERSION_CODES.O)
+public final class LegacyVoicemailNotifier {
+  private static final String NOTIFICATION_TAG = "LegacyVoicemail";
+  private static final int NOTIFICATION_ID = 1;
+
+  /**
+   * Replicates how packages/services/Telephony/NotificationMgr.java handles legacy voicemail
+   * notification. The notification will not be stackable because no information is available for
+   * individual voicemails.
+   */
+  public static void showNotification(
+      @NonNull Context context,
+      @NonNull PhoneAccountHandle handle,
+      int count,
+      String voicemailNumber,
+      PendingIntent callVoicemailIntent,
+      PendingIntent voicemailSettingsIntent,
+      boolean isRefresh) {
+    LogUtil.enterBlock("LegacyVoicemailNotifier.showNotification");
+    Assert.isNotNull(handle);
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+
+    TelephonyManager pinnedTelephonyManager =
+        context.getSystemService(TelephonyManager.class).createForPhoneAccountHandle(handle);
+    if (pinnedTelephonyManager == null) {
+      LogUtil.e("LegacyVoicemailNotifier.showNotification", "invalid PhoneAccountHandle");
+      return;
+    }
+
+    Notification notification =
+        createNotification(
+            context,
+            pinnedTelephonyManager,
+            handle,
+            count,
+            voicemailNumber,
+            callVoicemailIntent,
+            voicemailSettingsIntent,
+            isRefresh);
+    context
+        .getSystemService(NotificationManager.class)
+        .notify(NOTIFICATION_TAG, NOTIFICATION_ID, notification);
+  }
+
+  @NonNull
+  private static Notification createNotification(
+      @NonNull Context context,
+      @NonNull TelephonyManager pinnedTelephonyManager,
+      @NonNull PhoneAccountHandle handle,
+      int count,
+      String voicemailNumber,
+      PendingIntent callVoicemailIntent,
+      PendingIntent voicemailSettingsIntent,
+      boolean isRefresh) {
+    String notificationTitle =
+        context
+            .getResources()
+            .getQuantityString(R.plurals.notification_voicemail_title, count, count);
+    boolean isOngoing =
+        pinnedTelephonyManager
+            .getCarrierConfig()
+            .getBoolean(CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL);
+
+    String contentText;
+    PendingIntent contentIntent;
+    if (!TextUtils.isEmpty(voicemailNumber) && callVoicemailIntent != null) {
+      contentText = getNotificationText(context, handle, voicemailNumber);
+      contentIntent = callVoicemailIntent;
+    } else {
+      contentText = context.getString(R.string.notification_voicemail_no_vm_number);
+      contentIntent = voicemailSettingsIntent;
+    }
+
+    Notification.Builder builder =
+        new Notification.Builder(context)
+            .setSmallIcon(android.R.drawable.stat_notify_voicemail)
+            .setColor(context.getColor(R.color.dialer_theme_color))
+            .setWhen(System.currentTimeMillis())
+            .setContentTitle(notificationTitle)
+            .setContentText(contentText)
+            .setContentIntent(contentIntent)
+            .setSound(pinnedTelephonyManager.getVoicemailRingtoneUri(handle))
+            .setOngoing(isOngoing)
+            .setOnlyAlertOnce(isRefresh)
+            .setChannelId(NotificationChannelManager.getVoicemailChannelId(context, handle));
+
+    if (pinnedTelephonyManager.isVoicemailVibrationEnabled(handle)) {
+      builder.setDefaults(Notification.DEFAULT_VIBRATE);
+    }
+
+    return builder.build();
+  }
+
+  @NonNull
+  private static String getNotificationText(
+      @NonNull Context context, PhoneAccountHandle handle, String voicemailNumber) {
+    if (PhoneAccountUtils.getSubscriptionPhoneAccounts(context).size() > 1) {
+      TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+      PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle);
+      return phoneAccount.getShortDescription().toString();
+    } else {
+      return String.format(
+          context.getString(R.string.notification_voicemail_text_format),
+          PhoneNumberUtils.formatNumber(voicemailNumber));
+    }
+  }
+
+  public static void cancelNotification(@NonNull Context context) {
+    LogUtil.enterBlock("LegacyVoicemailNotifier.cancelNotification");
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    notificationManager.cancel(NOTIFICATION_TAG, NOTIFICATION_ID);
+  }
+
+  private LegacyVoicemailNotifier() {}
+}
diff --git a/java/com/android/dialer/app/calllog/MissedCallNotifier.java b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
index dd13298..e0e3fdf 100644
--- a/java/com/android/dialer/app/calllog/MissedCallNotifier.java
+++ b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
@@ -30,11 +30,13 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.annotation.WorkerThread;
+import android.support.v4.os.BuildCompat;
 import android.support.v4.os.UserManagerCompat;
 import android.support.v4.util.Pair;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
+import android.util.ArraySet;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.dialer.app.DialtactsActivity;
@@ -46,23 +48,20 @@
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.notification.NotificationChannelId;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 /** Creates a notification for calls that the user missed (neither answered nor rejected). */
 public class MissedCallNotifier implements Worker<Pair<Integer, String>, Void> {
 
-  /** The tag used to identify notifications from this class. */
-  static final String NOTIFICATION_TAG = "MissedCallNotifier";
-  /** The identifier of the notification of new missed calls. */
-  private static final int NOTIFICATION_ID = R.id.notification_missed_call;
+  static final String NOTIFICATION_TAG_PREFIX = "MissedCall_";
+  static final String NOTIFICATION_GROUP = "MissedCall";
+  private static final int NOTIFICATION_ID = 1;
 
   private final Context context;
   private final CallLogNotificationsQueryHelper callLogNotificationsQueryHelper;
@@ -104,7 +103,8 @@
 
     if ((newCalls != null && newCalls.isEmpty()) || count == 0) {
       // No calls to notify about: clear the notification.
-      CallLogNotificationsQueryHelper.removeMissedCallNotifications(context, null);
+      CallLogNotificationsQueryHelper.markAllMissedCallsInCallLogAsRead(context);
+      cancelAllMissedCallNotifications(context);
       return;
     }
 
@@ -146,7 +146,7 @@
                   null,
                   System.currentTimeMillis());
 
-      //TODO: look up caller ID that is not in contacts.
+      // TODO: look up caller ID that is not in contacts.
       ContactInfo contactInfo =
           callLogNotificationsQueryHelper.getContactInfo(
               call.number, call.numberPresentation, call.countryIso);
@@ -181,36 +181,39 @@
     publicSummaryBuilder
         .setContentTitle(context.getText(titleResId))
         .setContentIntent(createCallLogPendingIntent())
-        .setDeleteIntent(createClearMissedCallsPendingIntent(null));
+        .setDeleteIntent(
+            CallLogNotificationsService.createCancelAllMissedCallsPendingIntent(context));
 
     // Create the notification summary suitable for display when sensitive information is showing.
     groupSummary
         .setContentTitle(context.getText(titleResId))
         .setContentText(expandedText)
         .setContentIntent(createCallLogPendingIntent())
-        .setDeleteIntent(createClearMissedCallsPendingIntent(null))
+        .setDeleteIntent(
+            CallLogNotificationsService.createCancelAllMissedCallsPendingIntent(context))
         .setGroupSummary(useCallList)
         .setOnlyAlertOnce(useCallList)
         .setPublicVersion(publicSummaryBuilder.build());
-
-    NotificationChannelManager.applyChannel(groupSummary, context, Channel.MISSED_CALL, null);
+    if (BuildCompat.isAtLeastO()) {
+      groupSummary.setChannelId(NotificationChannelId.MISSED_CALL);
+    }
 
     Notification notification = groupSummary.build();
     configureLedOnNotification(notification);
 
     LogUtil.i("MissedCallNotifier.updateMissedCallNotification", "adding missed call notification");
-    getNotificationMgr().notify(NOTIFICATION_TAG, NOTIFICATION_ID, notification);
+    getNotificationMgr().notify(getNotificationTagForGroupSummary(), NOTIFICATION_ID, notification);
 
     if (useCallList) {
       // Do not repost active notifications to prevent erasing post call notes.
       NotificationManager manager = getNotificationMgr();
-      Set<String> activeTags = new HashSet<>();
+      Set<String> activeTags = new ArraySet<>();
       for (StatusBarNotification activeNotification : manager.getActiveNotifications()) {
         activeTags.add(activeNotification.getTag());
       }
 
       for (NewCall call : newCalls) {
-        String callTag = call.callsUri.toString();
+        String callTag = getNotificationTagForCall(call);
         if (!activeTags.contains(callTag)) {
           manager.notify(callTag, NOTIFICATION_ID, getNotificationForCall(call, null));
         }
@@ -218,6 +221,59 @@
     }
   }
 
+  public static void cancelAllMissedCallNotifications(@NonNull Context context) {
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
+      String tag = notification.getTag();
+      if (tag != null && tag.startsWith(NOTIFICATION_TAG_PREFIX)) {
+        notificationManager.cancel(tag, notification.getId());
+      }
+    }
+  }
+
+  public static void cancelSingleMissedCallNotification(
+      @NonNull Context context, @Nullable Uri callUri) {
+    if (callUri == null) {
+      LogUtil.e(
+          "MissedCallNotifier.cancelSingleMissedCallNotification",
+          "unable to cancel notification, uri is null");
+      return;
+    }
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    String callTag = getNotificationTagForCallUri(callUri);
+    String summaryTag = getNotificationTagForGroupSummary();
+    int notificationCount = 0;
+
+    for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
+      String currentTag = notification.getTag();
+      if (currentTag == null) {
+        continue;
+      }
+      if (currentTag.equals(callTag)) {
+        notificationManager.cancel(notification.getTag(), notification.getId());
+      } else if (currentTag.startsWith(NOTIFICATION_TAG_PREFIX) && !currentTag.equals(summaryTag)) {
+        notificationCount++;
+      }
+    }
+
+    if (notificationCount == 0) {
+      // There are no more missed call notifications. Remove the summary notification too.
+      notificationManager.cancel(summaryTag, NOTIFICATION_ID);
+    }
+  }
+
+  private static String getNotificationTagForGroupSummary() {
+    return NOTIFICATION_TAG_PREFIX + "GroupSummary";
+  }
+
+  private static String getNotificationTagForCall(@NonNull NewCall call) {
+    return getNotificationTagForCallUri(call.callsUri);
+  }
+
+  private static String getNotificationTagForCallUri(@NonNull Uri callUri) {
+    return NOTIFICATION_TAG_PREFIX + callUri;
+  }
+
   public void insertPostCallNotification(@NonNull String number, @NonNull String note) {
     List<NewCall> newCalls = callLogNotificationsQueryHelper.getNewMissedCalls();
     if (newCalls != null && !newCalls.isEmpty()) {
@@ -226,7 +282,9 @@
           // Update the first notification that matches our post call note sender.
           getNotificationMgr()
               .notify(
-                  call.callsUri.toString(), NOTIFICATION_ID, getNotificationForCall(call, note));
+                  getNotificationTagForCall(call),
+                  NOTIFICATION_ID,
+                  getNotificationForCall(call, note));
           break;
         }
       }
@@ -308,7 +366,7 @@
 
   private Notification.Builder createNotificationBuilder() {
     return new Notification.Builder(context)
-        .setGroup(NOTIFICATION_TAG)
+        .setGroup(NOTIFICATION_GROUP)
         .setSmallIcon(android.R.drawable.stat_notify_missed_call)
         .setColor(context.getResources().getColor(R.color.dialer_theme_color, null))
         .setAutoCancel(true)
@@ -321,10 +379,14 @@
     Builder builder =
         createNotificationBuilder()
             .setWhen(call.dateMs)
-            .setDeleteIntent(createClearMissedCallsPendingIntent(call.callsUri))
+            .setDeleteIntent(
+                CallLogNotificationsService.createCancelSingleMissedCallPendingIntent(
+                    context, call.callsUri))
             .setContentIntent(createCallLogPendingIntent(call.callsUri));
+    if (BuildCompat.isAtLeastO()) {
+      builder.setChannelId(NotificationChannelId.MISSED_CALL);
+    }
 
-    NotificationChannelManager.applyChannel(builder, context, Channel.MISSED_CALL, null);
     return builder;
   }
 
@@ -332,7 +394,8 @@
   @WorkerThread
   public void callBackFromMissedCall(String number, Uri callUri) {
     closeSystemDialogs(context);
-    CallLogNotificationsQueryHelper.removeMissedCallNotifications(context, callUri);
+    CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead(context, callUri);
+    cancelSingleMissedCallNotification(context, callUri);
     DialerUtils.startActivityWithErrorToast(
         context,
         new CallIntentBuilder(number, CallInitiationType.Type.MISSED_CALL_NOTIFICATION)
@@ -343,7 +406,8 @@
   /** Trigger an intent to send an sms from a missed call number. */
   public void sendSmsFromMissedCall(String number, Uri callUri) {
     closeSystemDialogs(context);
-    CallLogNotificationsQueryHelper.removeMissedCallNotifications(context, callUri);
+    CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead(context, callUri);
+    cancelSingleMissedCallNotification(context, callUri);
     DialerUtils.startActivityWithErrorToast(
         context, IntentUtil.getSendSmsIntent(number).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
   }
@@ -371,14 +435,6 @@
     return PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT);
   }
 
-  /** Creates a pending intent that marks all new missed calls as old. */
-  private PendingIntent createClearMissedCallsPendingIntent(@Nullable Uri callUri) {
-    Intent intent = new Intent(context, CallLogNotificationsService.class);
-    intent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_MISSED_CALLS_AS_OLD);
-    intent.setData(callUri);
-    return PendingIntent.getService(context, 0, intent, 0);
-  }
-
   private PendingIntent createCallBackPendingIntent(String number, @NonNull Uri callUri) {
     Intent intent = new Intent(context, CallLogNotificationsService.class);
     intent.setAction(CallLogNotificationsService.ACTION_CALL_BACK_FROM_MISSED_CALL_NOTIFICATION);
diff --git a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java b/java/com/android/dialer/app/calllog/PhoneAccountHandles.java
deleted file mode 100644
index acffffb..0000000
--- a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-package com.android.dialer.app.calllog;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
-import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.telecom.TelecomUtil;
-import java.util.List;
-
-/** Methods to help extract {@link PhoneAccount} information from database and Telecomm sources. */
-class PhoneAccountHandles {
-
-  @Nullable
-  public static PhoneAccountHandle getAccount(@NonNull Context context, @Nullable NewCall call) {
-    PhoneAccountHandle handle;
-    if (call == null || call.accountComponentName == null || call.accountId == null) {
-      LogUtil.v(
-          "PhoneAccountUtils.getAccount",
-          "accountComponentName == null || callToNotify.accountId == null");
-      handle = TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL);
-      if (handle == null) {
-        List<PhoneAccountHandle> callCapablePhoneAccounts =
-            TelecomUtil.getCallCapablePhoneAccounts(context);
-        if (!callCapablePhoneAccounts.isEmpty()) {
-          return callCapablePhoneAccounts.get(0);
-        }
-        return null;
-      }
-    } else {
-      handle =
-          new PhoneAccountHandle(
-              ComponentName.unflattenFromString(call.accountComponentName), call.accountId);
-    }
-    if (handle.getComponentName() != null) {
-      LogUtil.v(
-          "PhoneAccountUtils.getAccount",
-          "PhoneAccountHandle.ComponentInfo:" + handle.getComponentName());
-    } else {
-      LogUtil.i("PhoneAccountUtils.getAccount", "PhoneAccountHandle.ComponentInfo: null");
-    }
-    return handle;
-  }
-}
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java
new file mode 100644
index 0000000..99fe466
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java
@@ -0,0 +1,291 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.app.calllog;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.service.notification.StatusBarNotification;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.dialer.app.DialtactsActivity;
+import com.android.dialer.app.R;
+import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
+import com.android.dialer.app.contactinfo.ContactPhotoLoader;
+import com.android.dialer.app.list.DialtactsPagerAdapter;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.notification.NotificationChannelManager;
+import com.android.dialer.phonenumbercache.ContactInfo;
+import com.android.dialer.telecom.TelecomUtil;
+import java.util.List;
+import java.util.Map;
+
+/** Shows a notification in the status bar for visual voicemail. */
+final class VisualVoicemailNotifier {
+  private static final String NOTIFICATION_TAG_PREFIX = "VisualVoicemail_";
+  private static final String NOTIFICATION_GROUP = "VisualVoicemail";
+  private static final int NOTIFICATION_ID = 1;
+
+  public static void showNotifications(
+      @NonNull Context context,
+      @NonNull List<NewCall> newCalls,
+      @NonNull Map<String, ContactInfo> contactInfos,
+      @Nullable String callers) {
+    LogUtil.enterBlock("VisualVoicemailNotifier.showNotifications");
+    PendingIntent deleteIntent =
+        CallLogNotificationsService.createMarkAllNewVoicemailsAsOldIntent(context);
+    String contentTitle =
+        context
+            .getResources()
+            .getQuantityString(
+                R.plurals.notification_voicemail_title, newCalls.size(), newCalls.size());
+    Notification.Builder groupSummary =
+        createNotificationBuilder(context)
+            .setContentTitle(contentTitle)
+            .setContentText(callers)
+            .setDeleteIntent(deleteIntent)
+            .setGroupSummary(true)
+            .setContentIntent(newVoicemailIntent(context, null));
+
+    if (BuildCompat.isAtLeastO()) {
+      groupSummary.setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN);
+      PhoneAccountHandle handle = getAccountForCall(context, newCalls.get(0));
+      groupSummary.setChannelId(NotificationChannelManager.getVoicemailChannelId(context, handle));
+    }
+
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    notificationManager.notify(
+        getNotificationTagForGroupSummary(), NOTIFICATION_ID, groupSummary.build());
+
+    for (NewCall voicemail : newCalls) {
+      notificationManager.notify(
+          getNotificationTagForVoicemail(voicemail),
+          NOTIFICATION_ID,
+          createNotificationForVoicemail(context, voicemail, contactInfos));
+    }
+  }
+
+  public static void cancelAllVoicemailNotifications(@NonNull Context context) {
+    LogUtil.enterBlock("VisualVoicemailNotifier.cancelAllVoicemailNotifications");
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
+      String tag = notification.getTag();
+      if (tag != null && tag.startsWith(NOTIFICATION_TAG_PREFIX)) {
+        notificationManager.cancel(tag, notification.getId());
+      }
+    }
+  }
+
+  public static void cancelSingleVoicemailNotification(
+      @NonNull Context context, @Nullable Uri voicemailUri) {
+    LogUtil.enterBlock("VisualVoicemailNotifier.cancelSingleVoicemailNotification");
+    if (voicemailUri == null) {
+      LogUtil.e("VisualVoicemailNotifier.cancelSingleVoicemailNotification", "uri is null");
+      return;
+    }
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    String voicemailTag = getNotificationTagForUri(voicemailUri);
+    String summaryTag = getNotificationTagForGroupSummary();
+    int notificationCount = 0;
+
+    for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
+      String currentTag = notification.getTag();
+      if (currentTag == null) {
+        continue;
+      }
+      if (currentTag.equals(voicemailTag)) {
+        notificationManager.cancel(notification.getTag(), notification.getId());
+      } else if (currentTag.startsWith(NOTIFICATION_TAG_PREFIX) && !currentTag.equals(summaryTag)) {
+        notificationCount++;
+      }
+    }
+
+    if (notificationCount == 0) {
+      // There are no more visual voicemail notifications. Remove the summary notification too.
+      notificationManager.cancel(summaryTag, NOTIFICATION_ID);
+    }
+  }
+
+  private static String getNotificationTagForVoicemail(@NonNull NewCall voicemail) {
+    return getNotificationTagForUri(voicemail.voicemailUri);
+  }
+
+  private static String getNotificationTagForUri(@NonNull Uri voicemailUri) {
+    return NOTIFICATION_TAG_PREFIX + voicemailUri;
+  }
+
+  private static String getNotificationTagForGroupSummary() {
+    return NOTIFICATION_TAG_PREFIX + "GroupSummary";
+  }
+
+  private static Notification.Builder createNotificationBuilder(@NonNull Context context) {
+    return new Notification.Builder(context)
+        .setSmallIcon(android.R.drawable.stat_notify_voicemail)
+        .setColor(context.getColor(R.color.dialer_theme_color))
+        .setGroup(NOTIFICATION_GROUP)
+        .setOnlyAlertOnce(true)
+        .setAutoCancel(true);
+  }
+
+  private static Notification createNotificationForVoicemail(
+      @NonNull Context context,
+      @NonNull NewCall voicemail,
+      @NonNull Map<String, ContactInfo> contactInfos) {
+    PhoneAccountHandle handle = getAccountForCall(context, voicemail);
+    ContactInfo contactInfo = contactInfos.get(voicemail.number);
+
+    Notification.Builder builder =
+        createNotificationBuilder(context)
+            .setContentTitle(
+                context
+                    .getResources()
+                    .getQuantityString(R.plurals.notification_voicemail_title, 1, 1))
+            .setContentText(
+                ContactDisplayUtils.getTtsSpannedPhoneNumber(
+                    context.getResources(),
+                    R.string.notification_new_voicemail_ticker,
+                    contactInfo.name))
+            .setWhen(voicemail.dateMs)
+            .setSound(getVoicemailRingtoneUri(context, handle))
+            .setDefaults(getNotificationDefaultFlags(context, handle));
+
+    if (voicemail.voicemailUri != null) {
+      builder.setDeleteIntent(
+          CallLogNotificationsService.createMarkSingleNewVoicemailAsOldIntent(
+              context, voicemail.voicemailUri));
+    }
+
+    if (BuildCompat.isAtLeastO()) {
+      builder.setChannelId(NotificationChannelManager.getVoicemailChannelId(context, handle));
+    }
+
+    ContactPhotoLoader loader = new ContactPhotoLoader(context, contactInfo);
+    Bitmap photoIcon = loader.loadPhotoIcon();
+    if (photoIcon != null) {
+      builder.setLargeIcon(photoIcon);
+    }
+    if (!TextUtils.isEmpty(voicemail.transcription)) {
+      Logger.get(context)
+          .logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED_WITH_TRANSCRIPTION);
+      builder.setStyle(new Notification.BigTextStyle().bigText(voicemail.transcription));
+    }
+    builder.setContentIntent(newVoicemailIntent(context, voicemail));
+    Logger.get(context).logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED);
+    return builder.build();
+  }
+
+  @Nullable
+  private static Uri getVoicemailRingtoneUri(
+      @NonNull Context context, @Nullable PhoneAccountHandle handle) {
+    if (VERSION.SDK_INT < VERSION_CODES.N) {
+      return null;
+    }
+    if (handle == null) {
+      LogUtil.i("VisualVoicemailNotifier.getVoicemailRingtoneUri", "null handle, getting fallback");
+      handle = getFallbackAccount(context);
+      if (handle == null) {
+        LogUtil.i(
+            "VisualVoicemailNotifier.getVoicemailRingtoneUri",
+            "no fallback handle, using null (default) ringtone");
+        return null;
+      }
+    }
+    return context.getSystemService(TelephonyManager.class).getVoicemailRingtoneUri(handle);
+  }
+
+  private static int getNotificationDefaultFlags(
+      @NonNull Context context, @Nullable PhoneAccountHandle handle) {
+    if (VERSION.SDK_INT < VERSION_CODES.N) {
+      return Notification.DEFAULT_ALL;
+    }
+    if (handle == null) {
+      LogUtil.i(
+          "VisualVoicemailNotifier.getNotificationDefaultFlags", "null handle, getting fallback");
+      handle = getFallbackAccount(context);
+      if (handle == null) {
+        LogUtil.i(
+            "VisualVoicemailNotifier.getNotificationDefaultFlags",
+            "no fallback handle, using default vibration");
+        return Notification.DEFAULT_ALL;
+      }
+    }
+    if (context.getSystemService(TelephonyManager.class).isVoicemailVibrationEnabled(handle)) {
+      return Notification.DEFAULT_VIBRATE;
+    }
+    return 0;
+  }
+
+  private static PendingIntent newVoicemailIntent(
+      @NonNull Context context, @Nullable NewCall voicemail) {
+    Intent intent =
+        DialtactsActivity.getShowTabIntent(context, DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL);
+    // TODO (b/35486204): scroll to this voicemail
+    if (voicemail != null) {
+      intent.setData(voicemail.voicemailUri);
+    }
+    intent.putExtra(DialtactsActivity.EXTRA_CLEAR_NEW_VOICEMAILS, true);
+    return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+  }
+
+  /**
+   * Gets a phone account for the given call entry. This could be null if SIM associated with the
+   * entry is no longer in the device or for other reasons (for example, modem reboot).
+   */
+  @Nullable
+  public static PhoneAccountHandle getAccountForCall(
+      @NonNull Context context, @Nullable NewCall call) {
+    if (call == null || call.accountComponentName == null || call.accountId == null) {
+      return null;
+    }
+    return new PhoneAccountHandle(
+        ComponentName.unflattenFromString(call.accountComponentName), call.accountId);
+  }
+
+  /**
+   * Gets any available phone account that can be used to get sound settings for voicemail. This is
+   * only called if the phone account for the voicemail entry can't be found.
+   */
+  @Nullable
+  public static PhoneAccountHandle getFallbackAccount(@NonNull Context context) {
+    PhoneAccountHandle handle =
+        TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL);
+    if (handle == null) {
+      List<PhoneAccountHandle> handles = TelecomUtil.getCallCapablePhoneAccounts(context);
+      if (!handles.isEmpty()) {
+        handle = handles.get(0);
+      }
+    }
+    return handle;
+  }
+
+  private VisualVoicemailNotifier() {}
+}
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
new file mode 100644
index 0000000..d6601be
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2011 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
+ */
+
+package com.android.dialer.app.calllog;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import com.android.dialer.app.R;
+import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
+import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
+import com.android.dialer.blocking.FilteredNumbersUtil;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutors;
+import com.android.dialer.phonenumbercache.ContactInfo;
+import com.android.dialer.telecom.TelecomUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** Updates voicemail notifications in the background. */
+class VisualVoicemailUpdateTask implements Worker<VisualVoicemailUpdateTask.Input, Void> {
+  @Nullable
+  @Override
+  public Void doInBackground(@NonNull Input input) throws Throwable {
+    updateNotification(input.context, input.queryHelper, input.queryHandler);
+    return null;
+  }
+
+  /**
+   * Updates the notification and notifies of the call with the given URI.
+   *
+   * <p>Clears the notification if there are no new voicemails, and notifies if the given URI
+   * corresponds to a new voicemail.
+   */
+  @WorkerThread
+  private static void updateNotification(
+      Context context,
+      CallLogNotificationsQueryHelper queryHelper,
+      FilteredNumberAsyncQueryHandler queryHandler) {
+    Assert.isWorkerThread();
+
+    List<NewCall> newCalls = queryHelper.getNewVoicemails();
+    if (newCalls == null) {
+      return;
+    }
+    newCalls = filterBlockedNumbers(context, queryHandler, newCalls);
+    if (newCalls.isEmpty()) {
+      return;
+    }
+
+    // This represents a list of names to include in the notification.
+    String callers = null;
+
+    // Maps each number into a name: if a number is in the map, it has already left a more
+    // recent voicemail.
+    Map<String, ContactInfo> contactInfos = new ArrayMap<>();
+    for (NewCall newCall : newCalls) {
+      if (!contactInfos.containsKey(newCall.number)) {
+        ContactInfo contactInfo =
+            queryHelper.getContactInfo(
+                newCall.number, newCall.numberPresentation, newCall.countryIso);
+        contactInfos.put(newCall.number, contactInfo);
+
+        // This is a new caller. Add it to the back of the list of callers.
+        if (TextUtils.isEmpty(callers)) {
+          callers = contactInfo.name;
+        } else {
+          callers =
+              context.getString(
+                  R.string.notification_voicemail_callers_list, callers, contactInfo.name);
+        }
+      }
+    }
+    VisualVoicemailNotifier.showNotifications(context, newCalls, contactInfos, callers);
+  }
+
+  @WorkerThread
+  private static List<NewCall> filterBlockedNumbers(
+      Context context, FilteredNumberAsyncQueryHandler queryHandler, List<NewCall> newCalls) {
+    Assert.isWorkerThread();
+    if (FilteredNumbersUtil.hasRecentEmergencyCall(context)) {
+      LogUtil.i(
+          "VisualVoicemailUpdateTask.filterBlockedNumbers",
+          "not filtering due to recent emergency call");
+      return newCalls;
+    }
+
+    List<NewCall> result = new ArrayList<>();
+    for (NewCall newCall : newCalls) {
+      if (queryHandler.getBlockedIdSynchronous(newCall.number, newCall.countryIso) != null) {
+        LogUtil.i(
+            "VisualVoicemailUpdateTask.filterBlockedNumbers",
+            "found voicemail from blocked number, deleting");
+        if (newCall.voicemailUri != null) {
+          // Delete the voicemail.
+          CallLogAsyncTaskUtil.deleteVoicemailSynchronous(context, newCall.voicemailUri);
+        }
+      } else {
+        result.add(newCall);
+      }
+    }
+    return result;
+  }
+
+  /** Updates the voicemail notifications displayed. */
+  static void scheduleTask(@NonNull Context context, @NonNull Runnable callback) {
+    Assert.isNotNull(context);
+    Assert.isNotNull(callback);
+    if (!TelecomUtil.isDefaultDialer(context)) {
+      LogUtil.i("VisualVoicemailUpdateTask.scheduleTask", "not default dialer, not running");
+      callback.run();
+      return;
+    }
+
+    Input input =
+        new Input(
+            context,
+            CallLogNotificationsQueryHelper.getInstance(context),
+            new FilteredNumberAsyncQueryHandler(context));
+    DialerExecutors.createNonUiTaskBuilder(new VisualVoicemailUpdateTask())
+        .onSuccess(
+            output -> {
+              LogUtil.i("VisualVoicemailUpdateTask.scheduleTask", "update successful");
+              callback.run();
+            })
+        .onFailure(
+            throwable -> {
+              LogUtil.i("VisualVoicemailUpdateTask.scheduleTask", "update failed: " + throwable);
+              callback.run();
+            })
+        .build()
+        .executeParallel(input);
+  }
+
+  static class Input {
+    @NonNull final Context context;
+    @NonNull final CallLogNotificationsQueryHelper queryHelper;
+    @NonNull final FilteredNumberAsyncQueryHandler queryHandler;
+
+    Input(
+        Context context,
+        CallLogNotificationsQueryHelper queryHelper,
+        FilteredNumberAsyncQueryHandler queryHandler) {
+      this.context = context;
+      this.queryHelper = queryHelper;
+      this.queryHandler = queryHandler;
+    }
+  }
+}
diff --git a/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java b/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
index 777f4c7..2fbebdd 100644
--- a/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
+++ b/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
@@ -15,7 +15,6 @@
  */
 package com.android.dialer.app.calllog;
 
-import android.app.NotificationManager;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -23,30 +22,49 @@
 import android.net.Uri;
 import android.provider.CallLog.Calls;
 import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import com.android.dialer.app.R;
+import android.support.annotation.WorkerThread;
 import com.android.dialer.common.Assert;
-import com.android.dialer.notification.GroupedNotificationUtil;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.ThreadUtil;
 
 /** Handles asynchronous queries to the call log for voicemail. */
 public class VoicemailQueryHandler extends AsyncQueryHandler {
 
-  private static final String TAG = "VoicemailQueryHandler";
-
   /** The token for the query to mark all new voicemails as old. */
   private static final int UPDATE_MARK_VOICEMAILS_AS_OLD_TOKEN = 50;
 
-  private Context mContext;
-
   @MainThread
-  public VoicemailQueryHandler(Context context, ContentResolver contentResolver) {
+  private VoicemailQueryHandler(ContentResolver contentResolver) {
     super(contentResolver);
     Assert.isMainThread();
-    mContext = context;
+  }
+
+  @WorkerThread
+  public static void markAllNewVoicemailsAsRead(final @NonNull Context context) {
+    ThreadUtil.postOnUiThread(
+        () -> {
+          new VoicemailQueryHandler(context.getContentResolver()).markNewVoicemailsAsOld(null);
+        });
+  }
+
+  @WorkerThread
+  public static void markSingleNewVoicemailAsRead(
+      final @NonNull Context context, final Uri voicemailUri) {
+    if (voicemailUri == null) {
+      LogUtil.e("VoicemailQueryHandler.markSingleNewVoicemailAsRead", "voicemail URI is null");
+      return;
+    }
+    ThreadUtil.postOnUiThread(
+        () -> {
+          new VoicemailQueryHandler(context.getContentResolver())
+              .markNewVoicemailsAsOld(voicemailUri);
+        });
   }
 
   /** Updates all new voicemails to mark them as old. */
-  public void markNewVoicemailsAsOld(@Nullable Uri voicemailUri) {
+  private void markNewVoicemailsAsOld(@Nullable Uri voicemailUri) {
     // Mark all "new" voicemails as not new anymore.
     StringBuilder where = new StringBuilder();
     where.append(Calls.NEW);
@@ -70,11 +88,5 @@
         voicemailUri == null
             ? new String[] {Integer.toString(Calls.VOICEMAIL_TYPE)}
             : new String[] {Integer.toString(Calls.VOICEMAIL_TYPE), voicemailUri.toString()});
-
-    GroupedNotificationUtil.removeNotification(
-        mContext.getSystemService(NotificationManager.class),
-        voicemailUri != null ? voicemailUri.toString() : null,
-        R.id.notification_visual_voicemail,
-        DefaultVoicemailNotifier.VISUAL_VOICEMAIL_NOTIFICATION_TAG);
   }
 }
diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java
index 0399987..f856806 100644
--- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java
+++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java
@@ -17,15 +17,11 @@
 package com.android.dialer.app.calllog.calllogcache;
 
 import android.content.Context;
-import android.support.annotation.VisibleForTesting;
 import android.telecom.PhoneAccountHandle;
-import android.text.TextUtils;
 import android.util.ArrayMap;
-import android.util.Pair;
 import com.android.dialer.calllogutils.PhoneAccountUtils;
-import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.telecom.TelecomUtil;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * This is the CallLogCache for versions of dialer Lollipop Mr1 and above with support for multi-SIM
@@ -36,15 +32,6 @@
  */
 class CallLogCacheLollipopMr1 extends CallLogCache {
 
-  /*
-   * Maps from a phone-account/number pair to a boolean because multiple numbers could return true
-   * for the voicemail number if those numbers are not pre-normalized. Access must be synchronzied
-   * as it's used in the background thread in CallLogAdapter. {@see CallLogAdapter#loadData}
-   */
-  @VisibleForTesting
-  final Map<Pair<PhoneAccountHandle, CharSequence>, Boolean> mVoicemailQueryCache =
-      new ConcurrentHashMap<>();
-
   private final Map<PhoneAccountHandle, String> mPhoneAccountLabelCache = new ArrayMap<>();
   private final Map<PhoneAccountHandle, Integer> mPhoneAccountColorCache = new ArrayMap<>();
   private final Map<PhoneAccountHandle, Boolean> mPhoneAccountCallWithNoteCache = new ArrayMap<>();
@@ -55,7 +42,6 @@
 
   @Override
   public void reset() {
-    mVoicemailQueryCache.clear();
     mPhoneAccountLabelCache.clear();
     mPhoneAccountColorCache.clear();
     mPhoneAccountCallWithNoteCache.clear();
@@ -65,19 +51,7 @@
 
   @Override
   public boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number) {
-    if (TextUtils.isEmpty(number)) {
-      return false;
-    }
-
-    Pair<PhoneAccountHandle, CharSequence> key = new Pair<>(accountHandle, number);
-    Boolean value = mVoicemailQueryCache.get(key);
-    if (value != null) {
-      return value;
-    }
-    boolean isVoicemail =
-        PhoneNumberHelper.isVoicemailNumber(mContext, accountHandle, number.toString());
-    mVoicemailQueryCache.put(key, isVoicemail);
-    return isVoicemail;
+    return TelecomUtil.isVoicemailNumber(mContext, accountHandle, number.toString());
   }
 
   @Override
diff --git a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
index 32bbf06..82fc229 100644
--- a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
+++ b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
@@ -162,7 +162,7 @@
     ContactInfo info;
     if (request.isLocalRequest()) {
       info = mContactInfoHelper.lookupNumber(request.number, request.countryIso);
-      if (!info.contactExists) {
+      if (info != null && !info.contactExists) {
         // TODO: Maybe skip look up if it's already available in cached number lookup
         // service.
         long start = SystemClock.elapsedRealtime();
diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java
index a6c8b96..3cd3ac2 100644
--- a/java/com/android/dialer/app/dialpad/DialpadFragment.java
+++ b/java/com/android/dialer/app/dialpad/DialpadFragment.java
@@ -85,7 +85,9 @@
 import com.android.dialer.dialpadview.DialpadKeyButton;
 import com.android.dialer.dialpadview.DialpadView;
 import com.android.dialer.location.GeoUtil;
+import com.android.dialer.logging.UiAction;
 import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.proguard.UsedByReflection;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.CallUtil;
@@ -1015,6 +1017,8 @@
    */
   private void handleDialButtonPressed() {
     if (isDigitsEmpty()) { // No number entered.
+      // No real call made, so treat it as a click
+      PerformanceReport.recordClick(UiAction.Type.PRESS_CALL_BUTTON_WITHOUT_CALLING);
       handleDialButtonClickWithEmptyDigits();
     } else {
       final String number = mDigits.getText().toString();
@@ -1025,6 +1029,7 @@
       if (number != null
           && !TextUtils.isEmpty(mProhibitedPhoneNumberRegexp)
           && number.matches(mProhibitedPhoneNumberRegexp)) {
+        PerformanceReport.recordClick(UiAction.Type.PRESS_CALL_BUTTON_WITHOUT_CALLING);
         LogUtil.i(
             "DialpadFragment.handleDialButtonPressed",
             "The phone number is prohibited explicitly by a rule.");
@@ -1061,6 +1066,10 @@
       startActivity(newFlashIntent());
     } else {
       if (!TextUtils.isEmpty(mLastNumberDialed)) {
+        // Dialpad will be filled with last called number,
+        // but we don't want to record it as user action
+        PerformanceReport.setIgnoreActionOnce(UiAction.Type.TEXT_CHANGE_WITH_INPUT);
+
         // Recall the last number dialed.
         mDigits.setText(mLastNumberDialed);
 
diff --git a/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java b/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
index c208fd5..a483af9 100644
--- a/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
+++ b/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
@@ -41,6 +41,7 @@
       ViewGroup alertContainer,
       CallLogAdapter.CallFetcher callFetcher,
       CallLogAdapter.MultiSelectRemoveView multiSelectRemoveView,
+      CallLogAdapter.OnActionModeStateChangedListener actionModeStateChangedListener,
       CallLogCache callLogCache,
       ContactInfoCache contactInfoCache,
       VoicemailPlaybackPresenter voicemailPlaybackPresenter,
diff --git a/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java b/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
index 19fa1a7..488fbad 100644
--- a/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
+++ b/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
@@ -35,6 +35,7 @@
       ViewGroup alertContainer,
       CallLogAdapter.CallFetcher callFetcher,
       CallLogAdapter.MultiSelectRemoveView multiSelectRemoveView,
+      CallLogAdapter.OnActionModeStateChangedListener actionModeStateChangedListener,
       CallLogCache callLogCache,
       ContactInfoCache contactInfoCache,
       VoicemailPlaybackPresenter voicemailPlaybackPresenter,
@@ -45,6 +46,7 @@
         alertContainer,
         callFetcher,
         multiSelectRemoveView,
+        actionModeStateChangedListener,
         callLogCache,
         contactInfoCache,
         voicemailPlaybackPresenter,
diff --git a/java/com/android/dialer/app/list/AllContactsFragment.java b/java/com/android/dialer/app/list/AllContactsFragment.java
index f5fdb9e..32a99e7 100644
--- a/java/com/android/dialer/app/list/AllContactsFragment.java
+++ b/java/com/android/dialer/app/list/AllContactsFragment.java
@@ -38,6 +38,7 @@
 import com.android.contacts.common.list.ContactListFilter;
 import com.android.contacts.common.list.DefaultContactListAdapter;
 import com.android.dialer.app.R;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
@@ -46,6 +47,7 @@
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.widget.EmptyContentView;
 import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.util.Arrays;
 
 /** Fragments to show all contacts with phone numbers. */
 public class AllContactsFragment extends ContactEntryListFragment<ContactEntryListAdapter>
@@ -173,9 +175,15 @@
       return;
     }
 
-    if (!PermissionsUtil.hasPermission(activity, READ_CONTACTS)) {
+    String[] deniedPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+    if (deniedPermissions.length > 0) {
+      LogUtil.i(
+          "AllContactsFragment.onEmptyViewActionButtonClicked",
+          "Requesting permissions: " + Arrays.toString(deniedPermissions));
       FragmentCompat.requestPermissions(
-          this, new String[] {READ_CONTACTS}, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+          this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
     } else {
       // Add new contact
       DialerUtils.startActivityWithErrorToast(
diff --git a/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java b/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
index 04927cf..fc0bd3c 100644
--- a/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
+++ b/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
@@ -20,6 +20,7 @@
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
 import android.telephony.PhoneNumberUtils;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
@@ -177,33 +178,33 @@
                 resources,
                 R.string.search_shortcut_call_number,
                 mBidiFormatter.unicodeWrap(number, TextDirectionHeuristics.LTR));
-        drawable = getContext().getResources().getDrawable(R.drawable.quantum_ic_call_vd_theme_24);
+        drawable = ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_call_vd_theme_24);
         break;
       case SHORTCUT_CREATE_NEW_CONTACT:
         text = resources.getString(R.string.search_shortcut_create_new_contact);
         drawable =
-            getContext().getResources().getDrawable(R.drawable.quantum_ic_person_add_vd_theme_24);
+            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_person_add_vd_theme_24);
         drawable.setAutoMirrored(true);
         break;
       case SHORTCUT_ADD_TO_EXISTING_CONTACT:
         text = resources.getString(R.string.search_shortcut_add_to_contact);
         drawable =
-            getContext().getResources().getDrawable(R.drawable.quantum_ic_person_add_vd_theme_24);
+            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_person_add_vd_theme_24);
         break;
       case SHORTCUT_SEND_SMS_MESSAGE:
         text = resources.getString(R.string.search_shortcut_send_sms_message);
         drawable =
-            getContext().getResources().getDrawable(R.drawable.quantum_ic_message_vd_theme_24);
+            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_message_vd_theme_24);
         break;
       case SHORTCUT_MAKE_VIDEO_CALL:
         text = resources.getString(R.string.search_shortcut_make_video_call);
         drawable =
-            getContext().getResources().getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
+            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
         break;
       case SHORTCUT_BLOCK_NUMBER:
         text = resources.getString(R.string.search_shortcut_block_number);
         drawable =
-            getContext().getResources().getDrawable(R.drawable.ic_not_interested_googblue_24dp);
+            ContextCompat.getDrawable(getContext(), R.drawable.ic_not_interested_googblue_24dp);
         break;
       default:
         throw new IllegalArgumentException("Invalid shortcut type");
diff --git a/java/com/android/dialer/app/list/DialtactsPagerAdapter.java b/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
index dba3d3a..822aa78 100644
--- a/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
+++ b/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
@@ -28,8 +28,8 @@
 import com.android.dialer.calllog.CallLogFramework;
 import com.android.dialer.calllog.ui.NewCallLogFragment;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.contactsfragment.ContactsFragment;
 import com.android.dialer.database.CallLogQueryHandler;
 import com.android.dialer.speeddial.SpeedDialFragment;
@@ -78,7 +78,7 @@
     CallLogFramework callLogFramework = CallLogComponent.get(context).callLogFramework();
     useNewCallLogTab = callLogFramework.isNewCallLogEnabled(context);
     useNewContactsTab =
-        ConfigProviderBindings.get(context).getBoolean("enable_new_contacts_tab", false);
+        ConfigProviderBindings.get(context).getBoolean("enable_new_contacts_tab", true);
     this.tabTitles = tabTitles;
     hasActiveVoicemailProvider = hasVoicemailProvider;
     fragments.addAll(Collections.nCopies(TAB_COUNT_WITH_VOICEMAIL, null));
diff --git a/java/com/android/dialer/app/list/ListsFragment.java b/java/com/android/dialer/app/list/ListsFragment.java
index 32501d5..3f03db1 100644
--- a/java/com/android/dialer/app/list/ListsFragment.java
+++ b/java/com/android/dialer/app/list/ListsFragment.java
@@ -34,15 +34,11 @@
 import android.support.v4.view.ViewPager.OnPageChangeListener;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 import com.android.contacts.common.list.ViewPagerTabs;
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogFragment;
 import com.android.dialer.app.calllog.CallLogNotificationsService;
-import com.android.dialer.app.calllog.VisualVoicemailCallLogFragment;
 import com.android.dialer.app.voicemail.error.VoicemailStatusCorruptionHandler;
 import com.android.dialer.app.voicemail.error.VoicemailStatusCorruptionHandler.Source;
 import com.android.dialer.common.LogUtil;
@@ -51,6 +47,8 @@
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.speeddial.SpeedDialFragment;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;
@@ -64,22 +62,18 @@
  * Contacts list. This will also eventually contain the logic that allows sliding the ViewPager
  * containing the lists up above the search bar and pin it against the top of the screen.
  */
-public class ListsFragment extends Fragment
-    implements OnPageChangeListener, Listener, OnClickListener {
+public class ListsFragment extends Fragment implements OnPageChangeListener, Listener {
 
   private static final String TAG = "ListsFragment";
+
   private DialerViewPager mViewPager;
   private ViewPagerTabs mViewPagerTabs;
   private DialtactsPagerAdapter mAdapter;
   private RemoveView mRemoveView;
   private View mRemoveViewContent;
-  private View mMultiSelectSelectAllViewContent;
-  private TextView mSelectUnselectAllViewText;
-  private ImageView mSelectUnselectAllIcon;
   private Fragment mCurrentPage;
   private SharedPreferences mPrefs;
   private boolean mHasFetchedVoicemailStatus;
-  private boolean selectAllMode;
   private boolean mShowVoicemailTabAfterVoicemailStatusIsFetched;
   private VoicemailStatusHelper mVoicemailStatusHelper;
   private final ArrayList<OnPageChangeListener> mOnPageChangeListeners = new ArrayList<>();
@@ -89,6 +83,8 @@
   private boolean mPaused;
   private CallLogQueryHandler mCallLogQueryHandler;
 
+  private UiAction.Type[] actionTypeList;
+
   private final ContentObserver mVoicemailStatusObserver =
       new ContentObserver(new Handler()) {
         @Override
@@ -159,6 +155,12 @@
     Trace.endSection();
     Trace.beginSection(TAG + " setup views");
 
+    actionTypeList = new UiAction.Type[TAB_COUNT_WITH_VOICEMAIL];
+    actionTypeList[TAB_INDEX_SPEED_DIAL] = UiAction.Type.CHANGE_TAB_TO_FAVORITE;
+    actionTypeList[TAB_INDEX_HISTORY] = UiAction.Type.CHANGE_TAB_TO_CALL_LOG;
+    actionTypeList[TAB_INDEX_ALL_CONTACTS] = UiAction.Type.CHANGE_TAB_TO_CONTACTS;
+    actionTypeList[TAB_INDEX_VOICEMAIL] = UiAction.Type.CHANGE_TAB_TO_VOICEMAIL;
+
     String[] tabTitles = new String[TAB_COUNT_WITH_VOICEMAIL];
     tabTitles[TAB_INDEX_SPEED_DIAL] = getResources().getString(R.string.tab_speed_dial);
     tabTitles[TAB_INDEX_HISTORY] = getResources().getString(R.string.tab_history);
@@ -190,13 +192,6 @@
     addOnPageChangeListener(mViewPagerTabs);
     mRemoveView = (RemoveView) parentView.findViewById(R.id.remove_view);
     mRemoveViewContent = parentView.findViewById(R.id.remove_view_content);
-    mMultiSelectSelectAllViewContent =
-        parentView.findViewById(R.id.multi_select_select_all_view_content);
-    mSelectUnselectAllViewText = (TextView) parentView.findViewById(R.id.select_all_view_text);
-    mSelectUnselectAllIcon = (ImageView) parentView.findViewById(R.id.select_all_view_icon);
-    mMultiSelectSelectAllViewContent.setOnClickListener(null);
-    mSelectUnselectAllIcon.setOnClickListener(this);
-    mSelectUnselectAllViewText.setOnClickListener(this);
 
     if (PermissionsUtil.hasReadVoicemailPermissions(getContext())
         && PermissionsUtil.hasAddVoicemailPermissions(getContext())) {
@@ -227,8 +222,8 @@
 
   /**
    * Shows the tab with the specified index. If the voicemail tab index is specified, but the
-   * voicemail status hasn't been fetched, it will try to show the tab after the voicemail status
-   * has been fetched.
+   * voicemail status hasn't been fetched, it will show the speed dial tab and try to show the
+   * voicemail tab after the voicemail status has been fetched.
    */
   public void showTab(int index) {
     if (index == TAB_INDEX_VOICEMAIL) {
@@ -255,6 +250,8 @@
 
   @Override
   public void onPageSelected(int position) {
+    PerformanceReport.recordClick(actionTypeList[position]);
+
     LogUtil.i("ListsFragment.onPageSelected", "position: %d", position);
     mTabIndex = mAdapter.getRtlPosition(position);
 
@@ -389,7 +386,7 @@
   public void markMissedCallsAsReadAndRemoveNotifications() {
     if (mCallLogQueryHandler != null) {
       mCallLogQueryHandler.markMissedCallsAsRead();
-      CallLogNotificationsService.markNewMissedCallsAsOld(getContext(), null);
+      CallLogNotificationsService.cancelAllMissedCalls(getContext());
     }
   }
 
@@ -400,9 +397,7 @@
   }
 
   public void showMultiSelectRemoveView(boolean show) {
-    mMultiSelectSelectAllViewContent.setVisibility(show ? View.VISIBLE : View.GONE);
-    mMultiSelectSelectAllViewContent.setAlpha(show ? 0 : 1);
-    mMultiSelectSelectAllViewContent.animate().alpha(show ? 1 : 0).start();
+    mViewPagerTabs.setVisibility(show ? View.GONE : View.VISIBLE);
     mViewPager.setEnableSwipingPages(!show);
   }
 
@@ -445,28 +440,4 @@
     }
     Logger.get(getActivity()).logScreenView(screenType, getActivity());
   }
-
-  @Override
-  public void onClick(View v) {
-    updateSelectAllIcon();
-    selectAllMode = !selectAllMode;
-  }
-
-  public void setSelectAllModeToFalse() {
-    selectAllMode = false;
-    mSelectUnselectAllIcon.setImageDrawable(
-        getContext().getDrawable(R.drawable.ic_empty_check_mark_white_24dp));
-  }
-
-  private void updateSelectAllIcon() {
-    if (selectAllMode) {
-      mSelectUnselectAllIcon.setImageDrawable(
-          getContext().getDrawable(R.drawable.ic_empty_check_mark_white_24dp));
-      ((VisualVoicemailCallLogFragment) mCurrentPage).getAdapter().onAllDeselected();
-    } else {
-      mSelectUnselectAllIcon.setImageDrawable(
-          getContext().getDrawable(R.drawable.ic_check_mark_blue_24dp));
-      ((VisualVoicemailCallLogFragment) mCurrentPage).getAdapter().onAllSelected();
-    }
-  }
 }
diff --git a/java/com/android/dialer/app/list/OldSpeedDialFragment.java b/java/com/android/dialer/app/list/OldSpeedDialFragment.java
index 1ddc0f4..05d017b 100644
--- a/java/com/android/dialer/app/list/OldSpeedDialFragment.java
+++ b/java/com/android/dialer/app/list/OldSpeedDialFragment.java
@@ -56,6 +56,7 @@
 import com.android.dialer.util.ViewUtil;
 import com.android.dialer.widget.EmptyContentView;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /** This fragment displays the user's favorite/frequent contacts in a grid. */
 public class OldSpeedDialFragment extends Fragment
@@ -403,9 +404,15 @@
       return;
     }
 
-    if (!PermissionsUtil.hasPermission(activity, READ_CONTACTS)) {
+    String[] deniedPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+    if (deniedPermissions.length > 0) {
+      LogUtil.i(
+          "OldSpeedDialFragment.onEmptyViewActionButtonClicked",
+          "Requesting permissions: " + Arrays.toString(deniedPermissions));
       FragmentCompat.requestPermissions(
-          this, new String[] {READ_CONTACTS}, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+          this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
     } else {
       // Switch tabs
       ((HostInterface) activity).showAllContactsTab();
diff --git a/java/com/android/dialer/app/list/PhoneFavoriteTileView.java b/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
index 835b448..eb4f8e9 100644
--- a/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
+++ b/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
@@ -138,6 +138,8 @@
         }
 
         if (TextUtils.isEmpty(mPhoneNumberString)) {
+          // Don't set performance report now, since user may spend some time on picking a number
+
           // Copy "superclass" implementation
           Logger.get(getContext())
               .logInteraction(InteractionEvent.Type.SPEED_DIAL_CLICK_CONTACT_WITH_AMBIGUOUS_NUMBER);
diff --git a/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java b/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
index ce85982..876fbf1 100644
--- a/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
+++ b/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
@@ -200,7 +200,7 @@
     int multipleNumbersContactsCount = 0;
     int contactsWithPhotoCount = 0;
     int contactsWithNameCount = 0;
-    int duoReachableContactsCount = 0;
+    int lightbringerReachableContactsCount = 0;
 
     // The cursor should not be closed since this is invoked from a CursorLoader.
     if (cursor.moveToFirst()) {
@@ -308,7 +308,7 @@
       if (contact.phoneNumber == null) {
         multipleNumbersContactsCount++;
       } else if (lightbringer.isReachable(mContext, contact.phoneNumber)) {
-        duoReachableContactsCount++;
+        lightbringerReachableContactsCount++;
       }
     }
 
@@ -320,7 +320,7 @@
             multipleNumbersContactsCount,
             contactsWithPhotoCount,
             contactsWithNameCount,
-            duoReachableContactsCount);
+            lightbringerReachableContactsCount);
     // Logs for manual testing
     LogUtil.v("PhoneFavoritesTileAdapter.saveCursorToCache", "counter: %d", counter);
     LogUtil.v(
diff --git a/java/com/android/dialer/app/list/RegularSearchFragment.java b/java/com/android/dialer/app/list/RegularSearchFragment.java
index 4f03203..728948b 100644
--- a/java/com/android/dialer/app/list/RegularSearchFragment.java
+++ b/java/com/android/dialer/app/list/RegularSearchFragment.java
@@ -26,11 +26,13 @@
 import com.android.contacts.common.list.PinnedHeaderListView;
 import com.android.dialer.app.R;
 import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService;
 import com.android.dialer.phonenumbercache.PhoneNumberCache;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.widget.EmptyContentView;
 import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.util.Arrays;
 
 public class RegularSearchFragment extends SearchFragment
     implements OnEmptyViewActionButtonClickedListener,
@@ -114,8 +116,15 @@
     }
 
     if (READ_CONTACTS.equals(mPermissionToRequest)) {
-      FragmentCompat.requestPermissions(
-          this, new String[] {mPermissionToRequest}, PERMISSION_REQUEST_CODE);
+      String[] deniedPermissions =
+          PermissionsUtil.getPermissionsCurrentlyDenied(
+              getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+      if (deniedPermissions.length > 0) {
+        LogUtil.i(
+            "RegularSearchFragment.onEmptyViewActionButtonClicked",
+            "Requesting permissions: " + Arrays.toString(deniedPermissions));
+        FragmentCompat.requestPermissions(this, deniedPermissions, PERMISSION_REQUEST_CODE);
+      }
     }
   }
 
diff --git a/java/com/android/dialer/app/list/SearchFragment.java b/java/com/android/dialer/app/list/SearchFragment.java
index 7f2d176..00a2708 100644
--- a/java/com/android/dialer/app/list/SearchFragment.java
+++ b/java/com/android/dialer/app/list/SearchFragment.java
@@ -42,6 +42,8 @@
 import com.android.dialer.app.widget.DialpadSearchEmptyContentView;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
 import com.android.dialer.util.PermissionsUtil;
@@ -96,9 +98,6 @@
   public void onStart() {
     LogUtil.d("SearchFragment.onStart", "");
     super.onStart();
-    if (isSearchMode()) {
-      getAdapter().setHasHeader(0, false);
-    }
 
     mActivity = (HostInterface) getActivity();
 
@@ -170,16 +169,6 @@
     return animator;
   }
 
-  @Override
-  protected void setSearchMode(boolean flag) {
-    super.setSearchMode(flag);
-    // This hides the "All contacts with phone numbers" header in the search fragment
-    final ContactEntryListAdapter adapter = getAdapter();
-    if (adapter != null) {
-      adapter.setHasHeader(0, false);
-    }
-  }
-
   public void setAddToContactNumber(String addToContactNumber) {
     mAddToContactNumber = addToContactNumber;
   }
@@ -247,6 +236,10 @@
         }
         break;
       case DialerPhoneNumberListAdapter.SHORTCUT_CREATE_NEW_CONTACT:
+        if (this instanceof SmartDialSearchFragment) {
+          Logger.get(getContext())
+              .logImpression(DialerImpression.Type.CREATE_NEW_CONTACT_FROM_DIALPAD);
+        }
         number =
             TextUtils.isEmpty(mAddToContactNumber)
                 ? adapter.getFormattedQueryString()
@@ -255,6 +248,10 @@
         DialerUtils.startActivityWithErrorToast(getActivity(), intent);
         break;
       case DialerPhoneNumberListAdapter.SHORTCUT_ADD_TO_EXISTING_CONTACT:
+        if (this instanceof SmartDialSearchFragment) {
+          Logger.get(getContext())
+              .logImpression(DialerImpression.Type.ADD_TO_A_CONTACT_FROM_DIALPAD);
+        }
         number =
             TextUtils.isEmpty(mAddToContactNumber)
                 ? adapter.getFormattedQueryString()
diff --git a/java/com/android/dialer/app/list/SmartDialSearchFragment.java b/java/com/android/dialer/app/list/SmartDialSearchFragment.java
index fc21c8b..2ebc06b 100644
--- a/java/com/android/dialer/app/list/SmartDialSearchFragment.java
+++ b/java/com/android/dialer/app/list/SmartDialSearchFragment.java
@@ -34,6 +34,7 @@
 import com.android.dialer.database.DialerDatabaseHelper;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.widget.EmptyContentView;
+import java.util.Arrays;
 
 /** Implements a fragment to load and display SmartDial search results. */
 public class SmartDialSearchFragment extends SearchFragment
@@ -80,6 +81,11 @@
   }
 
   @Override
+  public boolean getShowEmptyListForNullQuery() {
+    return true;
+  }
+
+  @Override
   protected void setupEmptyView() {
     if (mEmptyView != null && getActivity() != null) {
       if (!PermissionsUtil.hasPermission(getActivity(), CALL_PHONE)) {
@@ -123,8 +129,16 @@
       return;
     }
 
-    FragmentCompat.requestPermissions(
-        this, new String[] {CALL_PHONE}, CALL_PHONE_PERMISSION_REQUEST_CODE);
+    String[] deniedPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            getContext(), PermissionsUtil.allPhoneGroupPermissionsUsedInDialer);
+    if (deniedPermissions.length > 0) {
+      LogUtil.i(
+          "SmartDialSearchFragment.onEmptyViewActionButtonClicked",
+          "Requesting permissions: " + Arrays.toString(deniedPermissions));
+      FragmentCompat.requestPermissions(
+          this, deniedPermissions, CALL_PHONE_PERMISSION_REQUEST_CODE);
+    }
   }
 
   @Override
diff --git a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
index 7c6df94..0729d72 100644
--- a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
+++ b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
@@ -41,6 +41,7 @@
       android:resizeableActivity="true"
       android:theme="@style/DialtactsActivityTheme"
       android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
+      <!-- LINT.IfChange -->
       <intent-filter>
         <action android:name="android.intent.action.DIAL"/>
 
@@ -106,6 +107,7 @@
         <category android:name="android.intent.category.DEFAULT"/>
         <category android:name="android.intent.category.TAB"/>
       </intent-filter>
+      <!-- LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/dialer/dialtacts/impl/AndroidManifest.xml) -->
 
       <meta-data
         android:name="com.android.keyguard.layout"
diff --git a/java/com/android/dialer/app/res/layout/call_log_fragment.xml b/java/com/android/dialer/app/res/layout/call_log_fragment.xml
index 8ed2d5b..bbfe4e3 100644
--- a/java/com/android/dialer/app/res/layout/call_log_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_fragment.xml
@@ -21,6 +21,36 @@
   android:background="@color/background_dialer_call_log"
   android:orientation="vertical">
 
+  <LinearLayout
+      android:id="@+id/multi_select_select_all_view_content"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/tab_height"
+      android:layout_gravity="start"
+      android:background="@color/actionbar_background_color"
+      android:orientation="horizontal"
+      android:visibility="gone">
+
+    <ImageView
+        android:id="@+id/select_all_view_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/select_all_icon_padding"
+        android:paddingRight="@dimen/select_all_icon_padding"
+        android:gravity="center_vertical"
+        android:src="@drawable/ic_empty_check_mark_white_24dp"/>
+    <TextView
+        android:id="@+id/select_all_view_text"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/select_all_text_left_padding"
+        android:gravity="center_vertical"
+        android:text="@string/select_all"
+        android:textAllCaps="true"
+        android:textStyle="bold"
+        android:textColor="@color/remove_text_color"
+        android:textSize="@dimen/select_all_text_size"/>
+  </LinearLayout>
+
   <FrameLayout
     android:id="@+id/modal_message_container"
     android:layout_width="match_parent"
diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item.xml b/java/com/android/dialer/app/res/layout/call_log_list_item.xml
index 4a3a836..afb50ff 100644
--- a/java/com/android/dialer/app/res/layout/call_log_list_item.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_list_item.xml
@@ -65,7 +65,7 @@
             android:layout_height="wrap_content"
             >
 
-          <QuickContactBadge
+          <com.android.dialer.app.calllog.DialerQuickContactBadge
               android:id="@+id/quick_contact_photo"
               android:layout_width="@dimen/contact_photo_size"
               android:layout_height="@dimen/contact_photo_size"
diff --git a/java/com/android/dialer/app/res/layout/lists_fragment.xml b/java/com/android/dialer/app/res/layout/lists_fragment.xml
index 71867d7..9596172 100644
--- a/java/com/android/dialer/app/res/layout/lists_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/lists_fragment.xml
@@ -95,43 +95,4 @@
 
   </com.android.dialer.app.list.RemoveView>
 
-  <FrameLayout
-      android:id="@+id/multi_select_view"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/tab_height"
-      android:layout_marginTop="@dimen/action_bar_height_large"
-      android:contentDescription="@string/remove_contact"
-      android:importantForAccessibility="no">
-
-    <LinearLayout
-        android:id="@+id/multi_select_select_all_view_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:background="@color/actionbar_background_color"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-      <ImageView
-          android:id="@+id/select_all_view_icon"
-          android:layout_width="wrap_content"
-          android:layout_height="match_parent"
-          android:paddingLeft="12dp"
-          android:gravity="center_vertical"
-          android:src="@drawable/ic_empty_check_mark_white_24dp"/>
-      <TextView
-          android:id="@+id/select_all_view_text"
-          android:layout_width="wrap_content"
-          android:layout_height="match_parent"
-          android:paddingLeft="30dp"
-          android:gravity="center_vertical"
-          android:text="@string/select_all"
-          android:textAllCaps="true"
-          android:textStyle="bold"
-          android:textColor="@color/remove_text_color"
-          android:textSize="@dimen/remove_text_size"/>
-    </LinearLayout>
-
-  </FrameLayout>
-
 </FrameLayout>
diff --git a/java/com/android/dialer/app/res/menu/dialtacts_options.xml b/java/com/android/dialer/app/res/menu/dialtacts_options.xml
index 25a3e18..b50e6ad 100644
--- a/java/com/android/dialer/app/res/menu/dialtacts_options.xml
+++ b/java/com/android/dialer/app/res/menu/dialtacts_options.xml
@@ -28,5 +28,8 @@
   <item
     android:id="@+id/menu_simulator_submenu"
     android:title="@string/simulator_submenu_label"/>
+  <item
+      android:id="@+id/menu_new_ui_launcher_shortcut"
+      android:title="@string/new_ui_launcher_shortcut_label"/>
 
 </menu>
diff --git a/java/com/android/dialer/app/res/values-af/strings.xml b/java/com/android/dialer/app/res/values-af/strings.xml
index 4f4c65b..40e2973 100644
--- a/java/com/android/dialer/app/res/values-af/strings.xml
+++ b/java/com/android/dialer/app/res/values-af/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Voeg wagtyd by"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Instellings"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Nabootser"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Skep nuwe UI-kortpad"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Alle kontakte"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Gebruik raak-nommerbord"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Keer terug na oproep wat besig is"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Kanselleer grootmaathandelingmodus"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"stemboodskap"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"stemboodskappe"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nee"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Vee uit"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Kanselleer"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Vee geselekteerde <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> uit?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> gekies"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Vee hierdie stemboodskappe uit? "</b>"</item>
+      <item quantity="one">"<b>"Vee hierdie stemboodskap uit? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> om <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-am/strings.xml b/java/com/android/dialer/app/res/values-am/strings.xml
index 7f4a622..08b52a6 100644
--- a/java/com/android/dialer/app/res/values-am/strings.xml
+++ b/java/com/android/dialer/app/res/values-am/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"መጠበቅ አክል"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ቅንብሮች"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"ማስመሰያ"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"አዲስ የዩአይ አቋራጭ ፍጠር"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"ሁሉም እውቅያዎች"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"የድምፅ ቁልፍ ሰሌዳን ንካ"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"በመካሄድ ላይ ወዳለው ጥሪ ተመለስ"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ሰከንድ"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> ደቂቃ <xliff:g id="SECONDS">%s</xliff:g> ሴከ"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"የጅምላ እርምጃ ሁነታ ይቅር"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"የድምፅ መልዕክት"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"የድምፅ መልዕክቶች"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"አዎ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"አይ"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ሰርዝ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ይቅር"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"የተመረጠው <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ይሰረዝ?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ተመርጠዋል"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"እነዚህ የድምፅ መልዕክቶች ይሰረዙ? "</b>"</item>
+      <item quantity="other">"<b>"እነዚህ የድምፅ መልዕክቶች ይሰረዙ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g> ላይ"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ar/strings.xml b/java/com/android/dialer/app/res/values-ar/strings.xml
index 3687d0b..fe84a66 100644
--- a/java/com/android/dialer/app/res/values-ar/strings.xml
+++ b/java/com/android/dialer/app/res/values-ar/strings.xml
@@ -84,6 +84,7 @@
     <string name="add_wait" msgid="1177723010768282578">"إضافة انتظار"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"الإعدادات"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"المحاكي"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"إنشاء اختصار للواجهة الجديدة"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"جميع جهات الاتصال"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"استخدام لوحة مفاتيح نغمات باللمس"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"عودة إلى المكالمة الجارية"</string>
@@ -108,12 +109,18 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ثانية"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> دقيقة <xliff:g id="SECONDS">%s</xliff:g> ثانية"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"إلغاء وضع الإجراءات المجمَّع"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"البريد الصوتي"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"رسائل البريد الصوتي"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"نعم"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"لا"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"حذف"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"إلغاء"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"حذف رسائل <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> المحددة؟"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"تم تحديد <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="zero">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
+      <item quantity="two">"<b>"حذف رسالتي البريد الصوتي هاتين؟ "</b>"</item>
+      <item quantity="few">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
+      <item quantity="many">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
+      <item quantity="other">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
+      <item quantity="one">"<b>"حذف رسالة البريد الصوتي هذه؟ "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> في <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-az/strings.xml b/java/com/android/dialer/app/res/values-az/strings.xml
index b6681c9..f2b0cf3 100644
--- a/java/com/android/dialer/app/res/values-az/strings.xml
+++ b/java/com/android/dialer/app/res/values-az/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Gözləmə əlavə edin"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ayarlar"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Stimulyator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Yeni İİ Qısayolu yaradın"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Bütün kontaktlar"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Toxunma ton klaviaturasını istifadə edin"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Davam edən zəngə qayıdın"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> san"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> dəq <xliff:g id="SECONDS">%s</xliff:g> san"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Qrup əməliyyatları rejimini ləğv edin"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"səsli e-məktub"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"səsli e-məktublar"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Bəli"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Xeyr"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Silin"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Ləğv edin"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Seçilmiş <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> silinsin?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> seçilib"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Bu səsli e-məktub silinsin? "</b>"</item>
+      <item quantity="one">"<b>"Bu səsli e-məktub silinsin? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> tarixində <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml
index 40c0886..b011f78 100644
--- a/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml
@@ -81,6 +81,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Dodaj čekanje"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Podešavanja"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Napravite prečicu za novi UI"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Svi kontakti"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Upotrebite brojčanik za tonsko biranje"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Vrati se na poziv koji je u toku"</string>
@@ -105,12 +106,15 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Otkažite režim grupnih radnji"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"govornu poruku"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"govorne poruke"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Da"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Otkaži"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Želite li da izbrišete izabranu(e) <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Izabranih: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Želite li da izbrišete ove govorne poruke? "</b>"</item>
+      <item quantity="few">"<b>"Želite li da izbrišete ove govorne poruke? "</b>"</item>
+      <item quantity="other">"<b>"Želite li da izbrišete ove govorne poruke? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> u <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-be/strings.xml b/java/com/android/dialer/app/res/values-be/strings.xml
index f2ad334..f9b0837 100644
--- a/java/com/android/dialer/app/res/values-be/strings.xml
+++ b/java/com/android/dialer/app/res/values-be/strings.xml
@@ -82,6 +82,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Дадаць чаканне"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Налады"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Сродак мадэліравання"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Ярлык новага карыст. інтэрфейсу"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Усе кантакты"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Выкарыстанне тонавай клавіятуры"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Звярнуцца да бягучага выкліку"</string>
@@ -106,12 +107,16 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> с"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> хв <xliff:g id="SECONDS">%s</xliff:g> с"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Скасаваць рэжым пакетных дзеянняў"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"галасавая пошта"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"галасавая пошта"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Так"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Не"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Выдаліць"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Скасаваць"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Выдаліць вылучанае: <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Выбрана: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
+      <item quantity="few">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
+      <item quantity="many">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
+      <item quantity="other">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> у <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-bg/strings.xml b/java/com/android/dialer/app/res/values-bg/strings.xml
index 8083f48..8b1105c 100644
--- a/java/com/android/dialer/app/res/values-bg/strings.xml
+++ b/java/com/android/dialer/app/res/values-bg/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Добавяне на изчакване"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Настройки"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулатор"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Пряк път към новия ПИ"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Всички контакти"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Използване на тонова клавиатура"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Назад към текущото обаждане"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Анулиране на режима на групови действия"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"гласово съобщение"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"гласови съобщения"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Да"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Не"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Изтриване"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Отказ"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Избрахте <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> – да се изтрие ли избраното?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Избрахте <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Да се изтрият ли тези гласови съобщения? "</b>"</item>
+      <item quantity="one">"<b>"Да се изтрие ли това гласово съобщение? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> в <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-bn/strings.xml b/java/com/android/dialer/app/res/values-bn/strings.xml
index 4d2d7cc..2ec3626 100644
--- a/java/com/android/dialer/app/res/values-bn/strings.xml
+++ b/java/com/android/dialer/app/res/values-bn/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"অপেক্ষা যোগ করুন"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"সেটিংস"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"সিমুলেটার"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"নতুন UI শর্টকাট তৈরি করুন"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"সকল পরিচিতি"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"স্পর্শ স্বর কীপ্যাড ব্যবহার করুন"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"প্রগতিতে থাকা কলে প্রত্যাবর্তন"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> সেকেন্ড"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> মিনিট <xliff:g id="SECONDS">%s</xliff:g> সেকেন্ড"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"ব্যাচ অ্যাকশন মোড বাতিল করুন"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ভয়েসমেল"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ভয়েসমেলগুলি"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"হ্যাঁ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"না"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"মুছুন"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"বাতিল করুন"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"নির্বাচিত <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> মুছে ফেলতে চান?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g>টি নির্বাচিত"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"এই ভয়েসমেলগুলি মুছবেন? "</b>"</item>
+      <item quantity="other">"<b>"এই ভয়েসমেলগুলি মুছবেন? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> তারিখে <xliff:g id="TIME">%2$s</xliff:g>\'টায়"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-bs/strings.xml b/java/com/android/dialer/app/res/values-bs/strings.xml
index d834772..087db12 100644
--- a/java/com/android/dialer/app/res/values-bs/strings.xml
+++ b/java/com/android/dialer/app/res/values-bs/strings.xml
@@ -81,6 +81,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Dodaj čekanje"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Postavke"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Kreiraj prečicu za novi UI"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Svi kontakti"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Koristi tastaturu za tonsko biranje"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Povratak na poziv u toku"</string>
@@ -105,12 +106,15 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Otkaži način rada za grupnu radnju"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"poruka govorne pošte"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"poruke govorne pošte"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Da"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Otkaži"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Izbrisati izabranu/e <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Odabrano <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Izbrisati ove govorne poruke? "</b>"</item>
+      <item quantity="few">"<b>"Izbrisati ove govorne poruke? "</b>"</item>
+      <item quantity="other">"<b>"Izbrisati ove govorne poruke? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> u <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ca/strings.xml b/java/com/android/dialer/app/res/values-ca/strings.xml
index 7b12e0d..7138580 100644
--- a/java/com/android/dialer/app/res/values-ca/strings.xml
+++ b/java/com/android/dialer/app/res/values-ca/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Afegeix espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Configuració"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crea drecera per a la nova IU"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Tots els contactes"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Utilitza el teclat de tons"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Torna a la trucada en curs"</string>
@@ -104,18 +105,20 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel·la el mode d\'accions en lot"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"missatge de veu"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"missatges de veu"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sí"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Suprimeix"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel·la"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Vols suprimir l\'element o elements seleccionats (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>)?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> seleccionades"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Vols suprimir aquests missatges de veu? "</b>"</item>
+      <item quantity="one">"<b>"Vols suprimir aquest missatge de veu? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> a les <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
     <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"No es pot trucar a aquest número."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Per configurar els missatges de veu, vés a Menú &gt; Configuració."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Per configurar els missatges de veu, ves a Menú &gt; Configuració."</string>
     <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Per trucar a la bústia de veu, primer has de desactivar el mode d\'avió."</string>
     <string name="contact_list_loading" msgid="7919825236309749352">"S\'està carregant…"</string>
     <string name="imei" msgid="5214505934662768308">"IMEI"</string>
@@ -229,7 +232,7 @@
     <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloqueja el número"</string>
     <string name="call_log_action_remove_spam" msgid="2045319806318398403">"No és una trucada brossa"</string>
     <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desbloqueja el número"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Contingut brossa"</string>
+    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Trucada brossa"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> no té connexió i no s\'hi pot contactar"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Informació"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-cs/strings.xml b/java/com/android/dialer/app/res/values-cs/strings.xml
index bbcb358..dbff467 100644
--- a/java/com/android/dialer/app/res/values-cs/strings.xml
+++ b/java/com/android/dialer/app/res/values-cs/strings.xml
@@ -82,6 +82,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Přidat čekání"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Nastavení"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulátor"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Vytv. zkratku na nové rozhraní"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Všechny kontakty"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Použít dotykovou tónovou klávesnici"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Návrat k probíhajícímu hovoru"</string>
@@ -106,12 +107,16 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Zrušit režim hromadných akcí"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"vybranou hlasovou zprávu"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"vybrané hlasové zprávy"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ano"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Smazat"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Zrušit"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Smazat <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Vybráno: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="few">"<b>"Smazat tyto hlasové zprávy? "</b>"</item>
+      <item quantity="many">"<b>"Smazat tyto hlasové zprávy? "</b>"</item>
+      <item quantity="other">"<b>"Smazat tyto hlasové zprávy? "</b>"</item>
+      <item quantity="one">"<b>"Smazat tuto hlasovou zprávu? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> v <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-da/strings.xml b/java/com/android/dialer/app/res/values-da/strings.xml
index 31cf8e3..72f5a28 100644
--- a/java/com/android/dialer/app/res/values-da/strings.xml
+++ b/java/com/android/dialer/app/res/values-da/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Tilføj ventetid"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Indstillinger"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Opret ny brugerfladegenvej"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Alle kontakter"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Brug numerisk tastatur"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Vend tilbage til igangværende opkald"</string>
@@ -88,7 +89,7 @@
     <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Massehandlingstilstanden startes"</string>
     <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Massehandlingstilstanden blev afsluttet"</string>
     <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Vælg <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Fravælg <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Fravalgt <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_call_log_play_button" msgid="2349845005022431438">"Afspil telefonsvarerbesked"</string>
     <string name="description_view_contact" msgid="3940984937384372665">"Vis kontaktpersonen <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="description_call" msgid="1532402285334775372">"Ring til <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annuller massehandlingstilstand"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"talebesked"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"talebeskeder"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nej"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Slet"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuller"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Vil du slette de valgte <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> er valgt"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Vil du slette denne talebesked? "</b>"</item>
+      <item quantity="other">"<b>"Vil du slette disse talebeskeder? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-de/strings.xml b/java/com/android/dialer/app/res/values-de/strings.xml
index c1f6441..a7efd53 100644
--- a/java/com/android/dialer/app/res/values-de/strings.xml
+++ b/java/com/android/dialer/app/res/values-de/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Warten hinzufügen"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Einstellungen"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Verknüpfung für neue Benutzeroberfläche erstellen"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Alle Kontakte"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Telefontastatur verwenden"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Zurück zum aktuellen Anruf"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Modus für Batch-Aktionen abbrechen"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"Mailboxnachricht"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"Mailboxnachrichten"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nein"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Löschen"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Abbrechen"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Ausgewählte <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> löschen?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ausgewählt"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Diese Mailboxnachrichten löschen? "</b>"</item>
+      <item quantity="one">"<b>"Diese Mailboxnachricht löschen? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> um <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-el/strings.xml b/java/com/android/dialer/app/res/values-el/strings.xml
index c4ba02d..7080e5e 100644
--- a/java/com/android/dialer/app/res/values-el/strings.xml
+++ b/java/com/android/dialer/app/res/values-el/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Προσθήκη αναμονής"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ρυθμίσεις"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Προσομοιωτής"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Δημ. νέας συντόμ. διεπαφής"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Όλες οι επαφές"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Χρησιμοποιήστε το πληκτρολόγιο αφής ηχητικών τόνων"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Επιστροφή στην κλήση που βρίσκεται σε εξέλιξη"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> δευτερόλεπτα"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> λεπτά <xliff:g id="SECONDS">%s</xliff:g> δευτερόλεπτα"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Ακύρωση λειτουργίας μαζικών ενεργειών"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"φωνητικού μηνύματος αυτόματου τηλεφωνητή"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"φωνητικών μηνυμάτων αυτόματου τηλεφωνητή"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ναι"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Όχι"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Διαγραφή"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Ακύρωση"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Διαγραφή επιλεγμ. <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>;"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Έχουν επιλεγεί <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Διαγραφή αυτών των μηνυμάτων αυτόματου τηλεφωνητή; "</b>"</item>
+      <item quantity="one">"<b>"Διαγραφή αυτού του μηνύματος αυτόματου τηλεφωνητή; "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> στις <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-en-rAU/strings.xml b/java/com/android/dialer/app/res/values-en-rAU/strings.xml
index cb7e912..999f7da 100644
--- a/java/com/android/dialer/app/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/app/res/values-en-rAU/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Add wait"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Settings"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Create new UI shortcut"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"All contacts"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Use touch tone keypad"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Return to call in progress"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel batch actions mode"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"voicemail"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"voicemails"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Yes"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Delete"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Delete selected <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selected"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Delete these voicemails? "</b>"</item>
+      <item quantity="one">"<b>"Delete this voicemail? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> at <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-en-rGB/strings.xml b/java/com/android/dialer/app/res/values-en-rGB/strings.xml
index cb7e912..999f7da 100644
--- a/java/com/android/dialer/app/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/app/res/values-en-rGB/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Add wait"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Settings"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Create new UI shortcut"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"All contacts"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Use touch tone keypad"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Return to call in progress"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel batch actions mode"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"voicemail"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"voicemails"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Yes"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Delete"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Delete selected <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selected"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Delete these voicemails? "</b>"</item>
+      <item quantity="one">"<b>"Delete this voicemail? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> at <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-en-rIN/strings.xml b/java/com/android/dialer/app/res/values-en-rIN/strings.xml
index cb7e912..999f7da 100644
--- a/java/com/android/dialer/app/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/app/res/values-en-rIN/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Add wait"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Settings"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Create new UI shortcut"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"All contacts"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Use touch tone keypad"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Return to call in progress"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel batch actions mode"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"voicemail"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"voicemails"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Yes"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Delete"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Delete selected <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selected"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Delete these voicemails? "</b>"</item>
+      <item quantity="one">"<b>"Delete this voicemail? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> at <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-es-rUS/strings.xml b/java/com/android/dialer/app/res/values-es-rUS/strings.xml
index 79d607f..701d74e 100644
--- a/java/com/android/dialer/app/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/app/res/values-es-rUS/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Agregar espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Configuración"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crear acceso a la nueva IU"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Todos los contactos"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usar teclado numérico"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Regresar a la llamada en curso"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar el modo de acción masiva"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"el mensaje de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"los mensajes de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sí"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Borrar"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"¿Deseas borrar <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> que seleccionaste?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> seleccionada(s)"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"¿Deseas borrar estos mensajes de voz? "</b>"</item>
+      <item quantity="one">"<b>"¿Deseas borrar este mensaje de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"El <xliff:g id="DATE">%1$s</xliff:g> a la hora <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-es/strings.xml b/java/com/android/dialer/app/res/values-es/strings.xml
index 170edc8..8cf47f5 100644
--- a/java/com/android/dialer/app/res/values-es/strings.xml
+++ b/java/com/android/dialer/app/res/values-es/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Añadir espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ajustes"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crear acceso a la interfaz"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Todos los contactos"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usar teclado táctil"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Volver a la llamada"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min y <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar el modo de acciones en lote"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"mensaje de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"mensajes de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sí"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eliminar"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"¿Eliminar la selección de <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Se han seleccionado <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"¿Eliminar estos mensajes de voz? "</b>"</item>
+      <item quantity="one">"<b>"¿Eliminar este mensaje de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> a las <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-et/strings.xml b/java/com/android/dialer/app/res/values-et/strings.xml
index e32b104..da043bf 100644
--- a/java/com/android/dialer/app/res/values-et/strings.xml
+++ b/java/com/android/dialer/app/res/values-et/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Lisa ootamine"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Seaded"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulaator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Loo uue kasutajaliid. otsetee"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Kõik kontaktid"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Kasuta puutetooniga klahvistikku"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Tagasi käimasolevale kõnele"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Mitme toimigu režiimi tühistamine"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"kõnepostisõnum"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"kõnepostisõnumid"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Jah"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ei"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Kustuta"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Tühista"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Kas kustutada valitud kõnepostisõnumid <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> on valitud"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Kas kustutada need kõnepostisõnumid? "</b>"</item>
+      <item quantity="one">"<b>"Kas kustutada see kõnepostisõnum? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kell <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-eu/strings.xml b/java/com/android/dialer/app/res/values-eu/strings.xml
index 57ef67d..071c6f3 100644
--- a/java/com/android/dialer/app/res/values-eu/strings.xml
+++ b/java/com/android/dialer/app/res/values-eu/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Gehitu itxaronaldia"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ezarpenak"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulagailua"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Sortu interfazerako esteka"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Kontaktu guztiak"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Erabili ukipen-tonuak dituen teklatua"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Itzuli abian den deira"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Utzi bertan behera ekintzak multzoka gauzatzeko modua"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ahots-mezua"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ahots-mezuak"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Bai"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ez"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ezabatu"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Utzi"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Hautatutako <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ezabatu?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> hautatu dira"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Ahots-mezu hauek ezabatu nahi dituzu? "</b>"</item>
+      <item quantity="one">"<b>"Ahots-mezu hau ezabatu nahi duzu? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> (<xliff:g id="TIME">%2$s</xliff:g>)"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-fa/strings.xml b/java/com/android/dialer/app/res/values-fa/strings.xml
index eadb0dc..6c58874 100644
--- a/java/com/android/dialer/app/res/values-fa/strings.xml
+++ b/java/com/android/dialer/app/res/values-fa/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"افزودن انتظار"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"تنظیمات"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"شبیه‌ساز"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ایجاد میان‌بر رابط کاربری جدید"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"همه مخاطبین"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"استفاده از صفحه‌کلید لمسی"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"برگشت به تماس درحال انجام"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ثانیه"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> دقیقه <xliff:g id="SECONDS">%s</xliff:g> ثانیه"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"لغو حالت اقدام‌ دسته‌ای"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"پست صوتی"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"پست‌های صوتی"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"بله"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"نه"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"حذف"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"لغو"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> انتخاب‌شده حذف شود؟"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> مورد انتخاب شد"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"این پست‌های صوتی حذف شوند؟ "</b>"</item>
+      <item quantity="other">"<b>"این پست‌های صوتی حذف شوند؟ "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ساعت <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-fi/strings.xml b/java/com/android/dialer/app/res/values-fi/strings.xml
index 9510959..55865d4 100644
--- a/java/com/android/dialer/app/res/values-fi/strings.xml
+++ b/java/com/android/dialer/app/res/values-fi/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Lisää tauko"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Asetukset"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulaattori"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Luo uusi UI-pikakuvake"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Kaikki yhteystiedot"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Käytä näppäimistöä"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Palaa käynnissä olevaan puheluun"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Peruuta joukkotoimintotila."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"vastaajaviesti"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"vastaajaviestit"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Kyllä"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ei"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Poista"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Peruuta"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Poistetaanko <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> valittu"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Poistetaanko nämä vastaajaviestit? "</b>"</item>
+      <item quantity="one">"<b>"Poistetaanko tämä vastaajaviesti? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> klo <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-fr-rCA/strings.xml b/java/com/android/dialer/app/res/values-fr-rCA/strings.xml
index 6aa285c..f10b121 100644
--- a/java/com/android/dialer/app/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/app/res/values-fr-rCA/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Ajouter Attendre"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Paramètres"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulateur"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Créer un raccourci vers l\'IU"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Tous les contacts"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Utiliser le clavier DTMF"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Reprendre l\'appel en cours"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min et <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annuler le mode d\'action par lots"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"message vocal"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"messages vocaux"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Oui"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Non"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Supprimer"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuler"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Supprimer la sélection (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>)?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> sélection(s)"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Supprimer ce message vocal? "</b>"</item>
+      <item quantity="other">"<b>"Supprimer ces messages vocaux? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> à <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-fr/strings.xml b/java/com/android/dialer/app/res/values-fr/strings.xml
index f539d2e..2ce930a 100644
--- a/java/com/android/dialer/app/res/values-fr/strings.xml
+++ b/java/com/android/dialer/app/res/values-fr/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Ajouter une attente"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Paramètres"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulateur"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Créer un raccourci vers la nouvelle interface"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Tous les contacts"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Utiliser le clavier DTMF"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Reprendre l\'appel en cours"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> secondes"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min et <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annuler le mode d\'actions groupées"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"message vocal"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"messages vocaux"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Oui"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Non"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Supprimer"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuler"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Supprimer les messages vocaux sélectionnés (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>) ?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> sélectionnés"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Supprimer ce message vocal ? "</b>"</item>
+      <item quantity="other">"<b>"Supprimer ces message vocaux ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> à <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-gl/strings.xml b/java/com/android/dialer/app/res/values-gl/strings.xml
index ca31c5e..b9e5407 100644
--- a/java/com/android/dialer/app/res/values-gl/strings.xml
+++ b/java/com/android/dialer/app/res/values-gl/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Engadir espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Configuración"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crear atallo para a nova IU"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Todos os contactos"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usar teclado de tons táctiles"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Volver á chamada en curso"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancela o modo de accións en lote"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"correo de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"correos de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Si"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Non"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eliminar"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Queres eliminar a selección (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>)?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Cantidade seleccionada: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Queres eliminar estes correos de voz? "</b>"</item>
+      <item quantity="one">"<b>"Queres eliminar este correo de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ás <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-gu/strings.xml b/java/com/android/dialer/app/res/values-gu/strings.xml
index fbe4d0a..ca8749a 100644
--- a/java/com/android/dialer/app/res/values-gu/strings.xml
+++ b/java/com/android/dialer/app/res/values-gu/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"પ્રતીક્ષા ઉમેરો"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"સેટિંગ્સ"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"સિમ્યુલેટર"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"નવું UI શૉર્ટકટ્સ બનાવો"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"તમામ સંપર્કો"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ટચ ટોન કીપેડનો ઉપયોગ કરો"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"કૉલ પર પાછા આવવું પ્રગતિ પર છે"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> સેકંડ"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> મિ <xliff:g id="SECONDS">%s</xliff:g> સે"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"બૅચ ક્રિયા મોડ રદ કરો"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"વૉઇસમેઇલ"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"વૉઇસમેઇલ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"હા"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"નહીં"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"કાઢી નાખો"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"રદ કરો"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"પસંદ કરેલ <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>ને કાઢી નાખીએ?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> પસંદ કરી"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"આ વૉઇસમેઇલ કાઢી નાખીએ? "</b>"</item>
+      <item quantity="other">"<b>"આ વૉઇસમેઇલ કાઢી નાખીએ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> નાં રોજ <xliff:g id="TIME">%2$s</xliff:g> વાગ્યે"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-hi/strings.xml b/java/com/android/dialer/app/res/values-hi/strings.xml
index c998e44..3bc9319 100644
--- a/java/com/android/dialer/app/res/values-hi/strings.xml
+++ b/java/com/android/dialer/app/res/values-hi/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"प्रतीक्षा का समय बढ़ाएं"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"सेटिंग"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"सिम्युलेटर"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"नया UI शॉर्टकट बनाएं"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"सभी संपर्क"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"टच टोन कीपैड का उपयोग करें"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"कॉल पर लौटना प्रगति पर है"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> सेकंड"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> मि. <xliff:g id="SECONDS">%s</xliff:g> से."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"बैच कार्रवाई मोड रद्द करें"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"वॉयसमेल"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"वॉयसमेल"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"हां"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"नहीं"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"हटाएं"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"रद्द करें"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"क्या चुने गए <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> हटाना चाहते हैं?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> चयनित"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"ये वॉइसमेल हटाएं? "</b>"</item>
+      <item quantity="other">"<b>"ये वॉइसमेल हटाएं? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> को <xliff:g id="TIME">%2$s</xliff:g> बजे"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-hr/strings.xml b/java/com/android/dialer/app/res/values-hr/strings.xml
index 5261cfb..0d21470 100644
--- a/java/com/android/dialer/app/res/values-hr/strings.xml
+++ b/java/com/android/dialer/app/res/values-hr/strings.xml
@@ -81,6 +81,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Dodaj čekanje"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Postavke"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Izrada prečaca novog sučelja"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Svi kontakti"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Koristi dodirnu zvučnu tipkovnicu"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Natrag na poziv u tijeku"</string>
@@ -105,12 +106,15 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Otkaži način skupnih radnji"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"poruka govorne pošte"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"poruke govorne pošte"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Da"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Odustani"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Želite li izbrisati odabranu poruku/e govorne pošte <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Odabrano: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Želite li izbrisati ove poruke govorne pošte? "</b>"</item>
+      <item quantity="few">"<b>"Želite li izbrisati ove poruke govorne pošte? "</b>"</item>
+      <item quantity="other">"<b>"Želite li izbrisati ove poruke govorne pošte? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> u <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-hu/strings.xml b/java/com/android/dialer/app/res/values-hu/strings.xml
index 452f0da..9a373e6 100644
--- a/java/com/android/dialer/app/res/values-hu/strings.xml
+++ b/java/com/android/dialer/app/res/values-hu/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Várakozás hozzáadása"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Beállítások"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Szimulátor"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Új felh. felület-parancsikon"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Összes névjegy"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Hangkódos telefonbillentyűzet használata"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Vissza a folyamatban lévő híváshoz"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> másodperc"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> perc <xliff:g id="SECONDS">%s</xliff:g> másodperc"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Köteges művelet mód leállítva"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"hangpostaüzenetet"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"hangpostaüzeneteket"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Igen"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nem"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Törlés"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Mégse"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Törli a kiválasztott <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> kiválasztva"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Törli ezeket a hangpostaüzeneteket? "</b>"</item>
+      <item quantity="one">"<b>"Törli ezt a hangpostaüzenetet? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-hy/strings.xml b/java/com/android/dialer/app/res/values-hy/strings.xml
index 97a84f2..2b2fbf6 100644
--- a/java/com/android/dialer/app/res/values-hy/strings.xml
+++ b/java/com/android/dialer/app/res/values-hy/strings.xml
@@ -80,12 +80,13 @@
     <string name="add_wait" msgid="1177723010768282578">"Ավելացնել սպասում"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Կարգավորումներ"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Նմանակիչ"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Ստեղծել միջերեսի նոր դյուրանցում"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Բոլոր կոնտակտները"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Օգտագործել հնչերանգներով ստեղնաշարը"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Վերադառնալ ընթացիկ զանգին"</string>
     <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Ավելացնել զանգ"</string>
     <string name="actionIncomingCall" msgid="891346596090030558">"Մուտքային զանգեր"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Մուտք զանգվածային գործողությունների ռեժին"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Դուք մտել եք զանգվածային գործողության ռեժիմ"</string>
     <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Դուք դուրս եկաք զանգվածային գործողությունների ռեժիմից"</string>
     <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Ընտրվեց՝ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Ապընտրվեց՝ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> վրկ"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> րոպե <xliff:g id="SECONDS">%s</xliff:g> վայրկյան"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Չեղարկել փաթեթային գործողությունների ռեժիմը"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ձայնային հաղորդագրություն"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ձայնային հաղորդագրություններ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Այո"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ոչ"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ջնջել"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Չեղարկել"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Ջնջե՞լ նշված <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>ը"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Ընտրվել է՝ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Delete these voicemails? "</b>"</item>
+      <item quantity="other">"<b>"Ջնջե՞լ այս ձայնային հաղորդագրությունները "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>-ին, ժամը <xliff:g id="TIME">%2$s</xliff:g>-ին"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-in/strings.xml b/java/com/android/dialer/app/res/values-in/strings.xml
index f309f92..e72fd63 100644
--- a/java/com/android/dialer/app/res/values-in/strings.xml
+++ b/java/com/android/dialer/app/res/values-in/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Tambahkan tunggu"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Setelan"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Buat Pintasan UI Baru"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Semua kontak"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Gunakan keypad nada sentuh"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Kembali ke panggilan sedang berlangsung"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> dtk"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> mnt <xliff:g id="SECONDS">%s</xliff:g> dtk"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Membatalkan mode tindakan kelompok"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"pesan suara"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"pesan suara"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ya"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Tidak"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Hapus"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Batal"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Hapus <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> yang dipilih?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> dipilih"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Hapus pesan suara ini? "</b>"</item>
+      <item quantity="one">"<b>"Hapus pesan suara ini? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> pukul <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-is/strings.xml b/java/com/android/dialer/app/res/values-is/strings.xml
index b291eae..bd329be 100644
--- a/java/com/android/dialer/app/res/values-is/strings.xml
+++ b/java/com/android/dialer/app/res/values-is/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Bæta töf við"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Stillingar"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Hermir"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Stofna flýtileið í nýtt viðmót"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Allir tengiliðir"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Nota snertitónatakkaborð"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Fara aftur í símtal í gangi"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> mín. og <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Hætta við runuaðgerðastillingu"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"talhólfsskilaboð"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"talhólfsskilaboð"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Já"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nei"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eyða"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Hætta við"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Eyða völdum <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> valin"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Eyða þessum talhólfsskilaboðum? "</b>"</item>
+      <item quantity="other">"<b>"Eyða þessum talhólfsskilaboðum? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-it/strings.xml b/java/com/android/dialer/app/res/values-it/strings.xml
index 711ab26..356f5a6 100644
--- a/java/com/android/dialer/app/res/values-it/strings.xml
+++ b/java/com/android/dialer/app/res/values-it/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Aggiungi attesa"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Impostazioni"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulatore"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crea nuova scorciatoia UI"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Tutti i contatti"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usa tastierino per selezione a toni"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Torna alla chiamata in corso"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> secondi"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annulla modalità di azione collettiva"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"messaggio vocale"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"messaggi vocali"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sì"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Elimina"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annulla"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Eliminare i <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> selezionati?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selezionate"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Eliminare questi messaggi vocali? "</b>"</item>
+      <item quantity="one">"<b>"Eliminare questo messaggio vocale? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> alle ore <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-iw/strings.xml b/java/com/android/dialer/app/res/values-iw/strings.xml
index bd2a05a..230555a 100644
--- a/java/com/android/dialer/app/res/values-iw/strings.xml
+++ b/java/com/android/dialer/app/res/values-iw/strings.xml
@@ -82,6 +82,7 @@
     <string name="add_wait" msgid="1177723010768282578">"הוסף המתנה"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"הגדרות"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"סימולטור"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"יצירת קיצור דרך לממשק החדש"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"כל אנשי הקשר"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"השתמש במקלדת עם חיוג צלילים"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"חזור לשיחה פעילה"</string>
@@ -106,12 +107,16 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> שניות"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> דק\' <xliff:g id="SECONDS">%s</xliff:g> שנ\'"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"ביטול המצב של ביצוע פעולות בכמות גדולה"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ההודעה הקולית"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ההודעות הקוליות"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"כן"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"לא"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"מחיקה"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ביטול"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"האם למחוק את <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> שבחרת?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> נבחרו"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="two">"<b>"האם למחוק את ההודעות הקוליות האלה? "</b>"</item>
+      <item quantity="many">"<b>"האם למחוק את ההודעות הקוליות האלה? "</b>"</item>
+      <item quantity="other">"<b>"האם למחוק את ההודעות הקוליות האלה? "</b>"</item>
+      <item quantity="one">"<b>"האם למחוק את ההודעה הקולית הזו? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ב-<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ja/strings.xml b/java/com/android/dialer/app/res/values-ja/strings.xml
index 9ba40fb..71fca83 100644
--- a/java/com/android/dialer/app/res/values-ja/strings.xml
+++ b/java/com/android/dialer/app/res/values-ja/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"待機を追加"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"設定"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"シミュレーション"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"新しいUIのショートカットを作成"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"すべての連絡先"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"プッシュホン式キーパッドを使う"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"通話に戻る"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g>秒"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g>分<xliff:g id="SECONDS">%s</xliff:g>秒"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"一括操作モードをキャンセルします"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ボイスメール"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ボイスメール"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"はい"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"いいえ"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"削除"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"キャンセル"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"選択した<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>を削除しますか？"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> 件選択済み"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"これらのボイスメールを削除しますか？"</b>"</item>
+      <item quantity="one">"<b>"このボイスメールを削除しますか？"</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>、<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g> 分 <xliff:g id="SECONDS">%2$02d</xliff:g> 秒"</string>
diff --git a/java/com/android/dialer/app/res/values-ka/strings.xml b/java/com/android/dialer/app/res/values-ka/strings.xml
index dbb48f4..fd9351f 100644
--- a/java/com/android/dialer/app/res/values-ka/strings.xml
+++ b/java/com/android/dialer/app/res/values-ka/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"ლოდინის დამატება"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"პარამეტრები"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"სიმულატორი"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ახალი UI მალსახმობის შექმნა"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"ყველა კონტაქტი"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ტონალური კლავიატურის გამოყენება"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"მიმდინარე ზარზე დაბრუნება"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> წმ"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> მინ <xliff:g id="SECONDS">%s</xliff:g> წამ"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"ერთიანი ქმედების რეჟიმის გაუქმება"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ხმოვანი ფოსტა"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ხმოვანი ფოსტა"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"დიახ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"არა"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"წაშლა"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"გაუქმება"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"გსურთ, წაშალოთ არჩეული <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"არჩეულია <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"გსურთ ამ ხმოვანი შეტყობინებების წაშლა? "</b>"</item>
+      <item quantity="one">"<b>"გსურთ ამ ხმოვანი შეტყობინების წაშლა? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-kk/strings.xml b/java/com/android/dialer/app/res/values-kk/strings.xml
index 8dfe531..f1763a2 100644
--- a/java/com/android/dialer/app/res/values-kk/strings.xml
+++ b/java/com/android/dialer/app/res/values-kk/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Күтуді қосу"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Параметрлер"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Жаңа пайдаланушы интерфейсінің пернелер тіркесімін жасау"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Барлық контактілер"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Сенсорлы әуенді пернетақта"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Қосылып тұрған қоңырауға оралу"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Топтама әрекеттер режимін жабу"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"дауыстық хабар"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"дауыстық хабарлар"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Иә"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Жоқ"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Жою"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Жабу"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Таңдалған <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> хабарларын жою қажет пе?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> таңдалды"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Осы дауыстық хабарларды жою қажет пе? "</b>"</item>
+      <item quantity="one">"<b>"Осы дауыстық хабарды жою қажет пе? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-km/strings.xml b/java/com/android/dialer/app/res/values-km/strings.xml
index ed0db05..54f1a12 100644
--- a/java/com/android/dialer/app/res/values-km/strings.xml
+++ b/java/com/android/dialer/app/res/values-km/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"បញ្ចូល​ការ​រង់ចាំ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ការកំណត់"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"កម្មវិធីធ្វើ​ដូច​មែនទែន"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"បង្កើត​ផ្លូវកាត់ UI ថ្មី"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"ទំនាក់ទំនង​ទាំងអស់"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ប្រើ​សំឡេង​ប៉ះ​បន្ទះ​លេខ"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"កំពុង​ត្រឡប់​ទៅកាន់​ការ​ហៅ"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> វិនាទី"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> នាទី <xliff:g id="SECONDS">%s</xliff:g> វិនាទី"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"បោះបង់​មុខងារ​សកម្មភាព​ជា​ក្រុម"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"សារ​ជា​សំឡេង"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"សារ​ជា​សំឡេង"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"បាទ/ចាស"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ទេ"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"លុប"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"បោះបង់"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"លុប <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ដែល​បាន​ជ្រើសរើស?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"បាន​ជ្រើសរើស <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"លុប​សារ​ជា​សំឡេង​ទាំងនេះ? "</b>"</item>
+      <item quantity="one">"<b>"លុប​សារ​ជា​សំឡេង​នេះ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> នៅម៉ោង <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-kn/strings.xml b/java/com/android/dialer/app/res/values-kn/strings.xml
index 932bc40..d7f3aab 100644
--- a/java/com/android/dialer/app/res/values-kn/strings.xml
+++ b/java/com/android/dialer/app/res/values-kn/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"ನಿರೀಕ್ಷೆಯನ್ನು ಸೇರಿಸಿ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"ಸಿಮ್ಯುಲೇಟರ್"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ಹೊಸ UI ಶಾರ್ಟ್‌ಕಟ್ ರಚಿಸಿ"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ಸ್ಪರ್ಶ ಟೋನ್ ಕೀಪ್ಯಾಡ್ ಬಳಸಿ"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"ಪ್ರತ್ಯತ್ತರ ಕರೆಯು ಪ್ರಗತಿಯಲ್ಲಿದೆ"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ಸೆಕೆಂ"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> ನಿಮಿ <xliff:g id="SECONDS">%s</xliff:g> ಸೆಕೆಂ"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"ಬ್ಯಾಚ್ ಕ್ರಿಯೆಗಳ ಮೋಡ್ ಅನ್ನು ರದ್ದುಮಾಡಿ"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ಧ್ವನಿಮೇಲ್‌ಗಳು"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ಹೌದು"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ಇಲ್ಲ"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ಅಳಿಸಿ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ರದ್ದುಮಾಡಿ"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ಆಯ್ಕೆ ಮಾಡಲಾದ <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ಅನ್ನು ಅಳಿಸುವುದೇ?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"ಈ ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಅಳಿಸುವುದೇ? "</b>"</item>
+      <item quantity="other">"<b>"ಈ ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಅಳಿಸುವುದೇ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ರಂದು <xliff:g id="TIME">%2$s</xliff:g> ಗಂಟೆಗೆ"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ko/strings.xml b/java/com/android/dialer/app/res/values-ko/strings.xml
index de6b93c..cb2e83c 100644
--- a/java/com/android/dialer/app/res/values-ko/strings.xml
+++ b/java/com/android/dialer/app/res/values-ko/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"대기 시간 추가"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"설정"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"시뮬레이터"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"새 UI 바로가기 만들기"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"모든 연락처"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"터치톤 키패드 사용"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"진행 중인 통화로 돌아가기"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g>초"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g>분 <xliff:g id="SECONDS">%s</xliff:g>초"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"일괄 작업 모드 취소"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"음성사서함"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"음성사서함"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"예"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"아니요"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"삭제"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"취소"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"선택한 <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>을(를) 삭제하시겠습니까?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g>개 선택됨"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"이 음성사서함을 삭제하시겠습니까? "</b>"</item>
+      <item quantity="one">"<b>"이 음성사서함을 삭제하시겠습니까? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>분 <xliff:g id="SECONDS">%2$02d</xliff:g>초"</string>
diff --git a/java/com/android/dialer/app/res/values-ky/strings.xml b/java/com/android/dialer/app/res/values-ky/strings.xml
index ac9a617..0a0b3e6 100644
--- a/java/com/android/dialer/app/res/values-ky/strings.xml
+++ b/java/com/android/dialer/app/res/values-ky/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Тыныгуу кошуу"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Жөндөөлөр"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Жаңы интерфейс үчүн кыска жол түзүү"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Бардык байланыштар"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Тоналдык терүү тактасын колдонуу"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Токтотулган чалууга кайтуу"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мүн. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Жапырт аракет режимин жокко чыгаруу"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"үн почтасы"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"үн почталары"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ооба"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Жок"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Жок кылуу"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Жокко чыгаруу"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Тандалган <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> жок кылынсынбы?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> тандалды"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Бул үн почталар жок кылынсынбы? "</b>"</item>
+      <item quantity="one">"<b>"Бул үн почта жок кылынсынбы? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> саат <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-lo/strings.xml b/java/com/android/dialer/app/res/values-lo/strings.xml
index 2a82973..267d1c6 100644
--- a/java/com/android/dialer/app/res/values-lo/strings.xml
+++ b/java/com/android/dialer/app/res/values-lo/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"ເພີ່ມການລໍຖ້າ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ການ​ຕັ້ງ​ຄ່າ"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"ຕົວຈຳລອງ"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ສ້າງປຸ່ມລັດສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ໃໝ່"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດ"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ໃຊ້ປຸ່ມກົດສັນຍານສຽງ"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"ກັບໄປການໂທທີ່ກຳລັງດຳເນີນຢູ່"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ວິນາທີ"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> ນ​ທ <xliff:g id="SECONDS">%s</xliff:g> ວິ"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"ຍົກເລີກໂໝດຄຳສັ່ງເປັນຊຸດ"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ແມ່ນແລ້ວ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ບໍ່"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ລຶບ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ຍົກເລີກ"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ລຶບ <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ທີ່ເລືອກອອກໄປບໍ?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"ເລືອກ <xliff:g id="NUMBER">%1$s</xliff:g> ລາຍການແລ້ວ"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ລຶບຂໍ້ຄວາມສຽງເຫຼົ່ານີ້ບໍ? "</b>"</item>
+      <item quantity="one">"<b>"ລຶບຂໍ້ຄວາມສຽງນີ້ບໍ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ເວລາ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-lt/strings.xml b/java/com/android/dialer/app/res/values-lt/strings.xml
index 367c928..e26a909 100644
--- a/java/com/android/dialer/app/res/values-lt/strings.xml
+++ b/java/com/android/dialer/app/res/values-lt/strings.xml
@@ -82,6 +82,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Pridėti laukimą"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Nustatymai"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simuliatorius"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Sukurti naują NS spart. klav."</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Visi kontaktai"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Naudoti jutiklinę klaviatūrą"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Grįžti prie vykdomo skambučio"</string>
@@ -106,12 +107,16 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Atšaukti masinių veiksmų režimą"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"balso pašto praneš."</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"balso pašto praneš."</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Taip"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ištrinti"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Atšaukti"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Ištrinti pasir. <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Pasirinkta: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
+      <item quantity="few">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
+      <item quantity="many">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
+      <item quantity="other">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-lv/strings.xml b/java/com/android/dialer/app/res/values-lv/strings.xml
index 2713b91..8df2813 100644
--- a/java/com/android/dialer/app/res/values-lv/strings.xml
+++ b/java/com/android/dialer/app/res/values-lv/strings.xml
@@ -81,6 +81,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Pievienot gaidīšanu"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Iestatījumi"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulators"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Jaunās liet. saskarnes saīsne"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Visas kontaktpersonas"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Izmantot skārientoņu tastatūru"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Atgriezties pie pašreizējā zvana"</string>
@@ -105,12 +106,15 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Iziet no grupas darbību režīma"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"balss pasta ziņojums"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"balss pasta ziņojumi"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Jā"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nē"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Dzēst"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Atcelt"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Vai dzēst atlasi: <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Atlasīti: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="zero">"<b>"Vai dzēst šos balss pasta ziņojumus? "</b>"</item>
+      <item quantity="one">"<b>"Vai dzēst šos balss pasta ziņojumus? "</b>"</item>
+      <item quantity="other">"<b>"Vai dzēst šos balss pasta ziņojumus? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> plkst. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-mk/strings.xml b/java/com/android/dialer/app/res/values-mk/strings.xml
index 09725a6..953a055 100644
--- a/java/com/android/dialer/app/res/values-mk/strings.xml
+++ b/java/com/android/dialer/app/res/values-mk/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Додај почекај"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Поставки"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулатор"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Создај крат. за нов интерфејс"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Сите контакти"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Користи тастатура со звуци на допир"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Врати се на повик во тек"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мин. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Откажи го режимот на групни дејства"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"говорна пошта"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"говорни пораки"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Да"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Не"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Избриши"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Откажи"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Да се избришат избраните <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Избрани се <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Да се избришат говорните пораки? "</b>"</item>
+      <item quantity="other">"<b>"Да се избришат говорните пораки? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> во <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ml/strings.xml b/java/com/android/dialer/app/res/values-ml/strings.xml
index 7655dbe..0eef407 100644
--- a/java/com/android/dialer/app/res/values-ml/strings.xml
+++ b/java/com/android/dialer/app/res/values-ml/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"കാത്തിരിക്കൽ ചേർക്കുക"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ക്രമീകരണം"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"സിമുലേറ്റർ"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"പുതിയ UI കുറുക്കുവഴി സൃഷ്‌ടിക്കുക"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ടച്ച് ടോൺ കീപാഡ് ഉപയോഗിക്കുക"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"വിളിച്ചുകൊണ്ടിരിക്കുന്ന കോളിലേക്ക് മടങ്ങുക"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> സെക്കൻഡ്"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> മി. <xliff:g id="SECONDS">%s</xliff:g> സെ."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"\'ബാച്ച് പ്രവർത്തനങ്ങൾ\' മോഡ് റദ്ദാക്കുക"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"വോയ്‌സ്മെയിലുകൾ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"അതെ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ഇല്ല"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ഇല്ലാതാക്കുക"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"റദ്ദാക്കൂ"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"തിരഞ്ഞെടുത്ത <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ഇല്ലാതാക്കണോ?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> എണ്ണം തിരഞ്ഞെടുത്തു"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ഈ വോയ്‌സ്‌മെയിലുകൾ ഇല്ലാതാക്കണോ? "</b>"</item>
+      <item quantity="one">"<b>"ഈ വോയ്‌സ്‌മെയിൽ ഇല്ലാതാക്കണോ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>-ന്"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-mn/strings.xml b/java/com/android/dialer/app/res/values-mn/strings.xml
index 29bd8af..e0cd987 100644
--- a/java/com/android/dialer/app/res/values-mn/strings.xml
+++ b/java/com/android/dialer/app/res/values-mn/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Хүлээлт нэмэх"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Тохиргоо"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Шинэ UI үүсгэх товчлол"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Бүх харилцагчид"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Хүрэлтээр дуугардаг гар ашиглах"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Үргэлжилж буй дуудлага руу буцах"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> минут <xliff:g id="SECONDS">%s</xliff:g> секунд"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Багц үйлдлийн горимыг цуцлах"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"дуут шуудан"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"дуут шуудан"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Тийм"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Үгүй"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Устгах"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Цуцлах"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Сонгосон <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>-г устгах уу?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> сонгосон"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Эдгээр дуут шууданг устгах уу? "</b>"</item>
+      <item quantity="one">"<b>"Энэ дуут шууданг устгах уу? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>-д"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-mr/strings.xml b/java/com/android/dialer/app/res/values-mr/strings.xml
index ee21291..70e6d41 100644
--- a/java/com/android/dialer/app/res/values-mr/strings.xml
+++ b/java/com/android/dialer/app/res/values-mr/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"प्रतीक्षा करा जोडा"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"सेटिंग्ज"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"सिम्युलेटर"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"नवीन UI शॉर्टकट तयार करा"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"सर्व संपर्क"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"स्‍पर्श टोन कीपॅडचा वापर करा"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"चालू असलेल्या कॉलवर परत जा"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> सेकंद"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> मिनिट <xliff:g id="SECONDS">%s</xliff:g> सेकंद"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"बॅच क्रिया मोड रद्द करा"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"व्हॉइसमेल"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"व्हॉइसमेल"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"होय"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"नाही"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"हटवा"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"रद्द करा"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"निवडलेले <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> हटवायचेे?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> निवडले"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"हा व्हॉइसमेल हटवायचा? "</b>"</item>
+      <item quantity="other">"<b>"हे व्हॉइसमेल हटवायचे? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> रोजी <xliff:g id="TIME">%2$s</xliff:g> वाजता"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ms/strings.xml b/java/com/android/dialer/app/res/values-ms/strings.xml
index dbb0213..f58f08f 100644
--- a/java/com/android/dialer/app/res/values-ms/strings.xml
+++ b/java/com/android/dialer/app/res/values-ms/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Tambah penungguan"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Tetapan"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Buat Pintasan UI Baharu"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Semua kenalan"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Gunakan pad kekunci nada sentuh"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Kembali ke panggilan yang sedang berlangsung"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> saat"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> saat"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Batalkan mod tindakan kelompok"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"mel suara"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"mel suara"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ya"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Tidak"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Padam"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Batal"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Padam <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> yang dipilih?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> dipilih"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Padamkan mel suara ini? "</b>"</item>
+      <item quantity="one">"<b>"Padamkan mel suara ini? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> pada <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-my/strings.xml b/java/com/android/dialer/app/res/values-my/strings.xml
index eecfeb2..60c3271 100644
--- a/java/com/android/dialer/app/res/values-my/strings.xml
+++ b/java/com/android/dialer/app/res/values-my/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"စောင့်ဆိုင်းခြင်း ထည့်ပါ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ဆက်တင်များ"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"အသစ်ကဲ့သို့ တုပသည့်စနစ်"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"UI ဖြတ်လမ်းလင့်ခ်အသစ် လုပ်ရန်"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"လိပ်စာများအားလုံး"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"touch tone ကီးခလုတ် ကိုအသုံးပြုပါ"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"ဖုန်းပြန်ခေါ်မှု ပြုလုပ်နေစဉ်"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> စက္ကန့်"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> မိနစ် <xliff:g id="SECONDS">%s</xliff:g> စက္ကန့်"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်များမုဒ်ကိ ပယ်ဖျက်ရန်"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"အသံမေးလ်"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"အသံမေးလ်များ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Yes"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ဖျက်ပါ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"မလုပ်တော့"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ရွေးထားသော <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ကို ဖျက်လိုပါသလား။"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ကို ရွေးချယ်ထားသည်"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ဤအသံမေးလ်များကို ဖျက်မလား။ "</b>"</item>
+      <item quantity="one">"<b>"ဤအသံမေးလ်ကို ဖျက်မလား။ "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g> ၌"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-nb/strings.xml b/java/com/android/dialer/app/res/values-nb/strings.xml
index bda4915..344a26a 100644
--- a/java/com/android/dialer/app/res/values-nb/strings.xml
+++ b/java/com/android/dialer/app/res/values-nb/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Legg til Vent"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Innstillinger"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Nytt grensesnitt – lag snarvei"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Alle kontakter"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Bruk tonetastatur"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Gå tilbake til aktiv samtale"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Avbryt massehandlinsmodus"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"talepost"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"talepost"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nei"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Slett"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Avbryt"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Slett markert <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> er valgt"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Vil du slette disse talemeldingene? "</b>"</item>
+      <item quantity="one">"<b>"Vil du slette denne talemeldingen? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ne/strings.xml b/java/com/android/dialer/app/res/values-ne/strings.xml
index 8262a31..5e70c40 100644
--- a/java/com/android/dialer/app/res/values-ne/strings.xml
+++ b/java/com/android/dialer/app/res/values-ne/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"पर्खाइ थप्नुहोस्"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"सेटिङ्हरू"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"सिम्युलेटर"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"नयाँ UI सर्टकट सिर्जना गर्ने"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"सबै सम्पर्कहरू"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"स्पर्श टोन किप्याडको प्रयोग गर्नुहोस्"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"हुदै गरेको कलमा फर्कनुहोस्"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> सेकेन्ड"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> मिनेट <xliff:g id="SECONDS">%s</xliff:g> सकेन्ड"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"ब्याच सम्बन्धी कारबाहीको मोडलाई रद्द गर्नुहोस्"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"भ्वाइस मेल"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"भ्वाइस मेलहरू"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"हो"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"होइन"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"मेट्नुहोस्"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"रद्द गर्नुहोस्"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"चयन गरिएका <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> लाई मेटाउने हो?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> चयन गरियो"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"यी भ्वाइस मेलहरू मेट्ने हो? "</b>"</item>
+      <item quantity="one">"<b>"यो भ्वाइस मेल मेट्ने हो? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> मा <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-nl/strings.xml b/java/com/android/dialer/app/res/values-nl/strings.xml
index eed412d..dbd29bc 100644
--- a/java/com/android/dialer/app/res/values-nl/strings.xml
+++ b/java/com/android/dialer/app/res/values-nl/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Wachten toevoegen"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Instellingen"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Snelkoppeling voor nieuwe UI"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Alle contacten"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Toetsen voor toonkiezen gebruiken"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Terug naar actief gesprek"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sec."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sec."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Modus voor batchacties annuleren"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"voicemail"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"voicemails"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nee"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Verwijderen"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuleren"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Geselecteerde <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> verwijderen?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> geselecteerd"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Deze voicemails verwijderen? "</b>"</item>
+      <item quantity="one">"<b>"Deze voicemail verwijderen? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> om <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-no/strings.xml b/java/com/android/dialer/app/res/values-no/strings.xml
index bda4915..344a26a 100644
--- a/java/com/android/dialer/app/res/values-no/strings.xml
+++ b/java/com/android/dialer/app/res/values-no/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Legg til Vent"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Innstillinger"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Nytt grensesnitt – lag snarvei"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Alle kontakter"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Bruk tonetastatur"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Gå tilbake til aktiv samtale"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Avbryt massehandlinsmodus"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"talepost"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"talepost"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nei"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Slett"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Avbryt"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Slett markert <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> er valgt"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Vil du slette disse talemeldingene? "</b>"</item>
+      <item quantity="one">"<b>"Vil du slette denne talemeldingen? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-pa/strings.xml b/java/com/android/dialer/app/res/values-pa/strings.xml
index 8e65407..33afd58 100644
--- a/java/com/android/dialer/app/res/values-pa/strings.xml
+++ b/java/com/android/dialer/app/res/values-pa/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"ਉਡੀਕ ਜੋੜੋ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"ਸਿਮੁਲੇਟਰ"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ਨਵਾਂ UI ਸ਼ਾਰਟਕੱਟ ਬਣਾਓ"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"ਸਾਰੇ ਸੰਪਰਕ"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ਟਚ ਟੋਨ ਕੀਪੈਡ ਵਰਤੋ"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"ਪ੍ਰਗਤੀ ਵਿੱਚ ਕਾਲ ਤੇ ਵਾਪਸ ਜਾਓ"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ਸਕਿੰਟ"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> ਮਿੰਟ <xliff:g id="SECONDS">%s</xliff:g> ਸਕਿੰਟ"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"ਬੈਚ ਕਾਰਵਾਈਆਂ ਮੋਡ ਨੂੰ ਰੱਦ ਕਰੋ"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ਵੌਇਸਮੇਲ"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ਵੌਇਸਮੇਲਾਂ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ਹਾਂ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ਨਹੀਂ"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ਮਿਟਾਓ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ਰੱਦ ਕਰੋ"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ਕੀ ਚੁਣੀ(ਆਂ) ਹੋਈ(ਆਂ) <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ਨੂੰ ਚੁਣਿਆ ਗਿਆ"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"ਕੀ ਇਸ ਵੌਇਸਮੇਲ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? "</b>"</item>
+      <item quantity="other">"<b>"ਕੀ ਇਹਨਾਂ ਵੌਇਸਮੇਲਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ਨੂੰ <xliff:g id="TIME">%2$s</xliff:g> ਵਜੇ"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-pl/strings.xml b/java/com/android/dialer/app/res/values-pl/strings.xml
index 8f57a82..7f6027c 100644
--- a/java/com/android/dialer/app/res/values-pl/strings.xml
+++ b/java/com/android/dialer/app/res/values-pl/strings.xml
@@ -82,6 +82,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Dodaj oczekiwanie"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ustawienia"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Symulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Utwórz skrót do nowego interfejsu"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Wszystkie kontakty"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Użyj klawiatury tonowej"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Wróć do aktywnego połączenia"</string>
@@ -106,12 +107,16 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Anuluj tryb działań zbiorczych"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"wiadomości głosowe"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"wiadomości głosowe"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Tak"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nie"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Usuń"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Anuluj"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Usunąć wybrane <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Wybrane: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="few">"<b>"Usunąć te wiadomości głosowe? "</b>"</item>
+      <item quantity="many">"<b>"Usunąć te wiadomości głosowe? "</b>"</item>
+      <item quantity="other">"<b>"Usunąć te wiadomości głosowe? "</b>"</item>
+      <item quantity="one">"<b>"Usunąć tę wiadomość głosową? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> o <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-pt-rBR/strings.xml b/java/com/android/dialer/app/res/values-pt-rBR/strings.xml
index eb61923..768ce57 100644
--- a/java/com/android/dialer/app/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt-rBR/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Adicionar espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Configurações"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Criar atalho para a nova IU"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Todos os contatos"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usar teclado multifrequencial"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Retornar para a chamada em espera"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> seg"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> m <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar modo de ações em lote"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"correio de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"correios de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sim"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Não"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Excluir"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Excluir a seleção de <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Itens selecionados: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Excluir este correio de voz? "</b>"</item>
+      <item quantity="other">"<b>"Excluir estes correios de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> às <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-pt-rPT/strings.xml b/java/com/android/dialer/app/res/values-pt-rPT/strings.xml
index 493f846..3c636e1 100644
--- a/java/com/android/dialer/app/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt-rPT/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Adicionar espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Definições"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Criar novo atalho de IU"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Todos os contactos"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Utilizar teclado numérico com tons de toque"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Voltar à chamada em curso"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> seg"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> seg."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar modo de ações em lote"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"mensagem de correio de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"mensagens de correio de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sim"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Não"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eliminar"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Pretende eliminar a(s) <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> selecionada(s)?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selecionada(s)"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Pretende eliminar esta(s) mensagem(ns) de correio de voz? "</b>"</item>
+      <item quantity="other">"<b>"Pretende eliminar estas mensagens de correio de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> às <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-pt/strings.xml b/java/com/android/dialer/app/res/values-pt/strings.xml
index eb61923..768ce57 100644
--- a/java/com/android/dialer/app/res/values-pt/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Adicionar espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Configurações"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Criar atalho para a nova IU"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Todos os contatos"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usar teclado multifrequencial"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Retornar para a chamada em espera"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> seg"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> m <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar modo de ações em lote"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"correio de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"correios de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sim"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Não"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Excluir"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Excluir a seleção de <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Itens selecionados: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Excluir este correio de voz? "</b>"</item>
+      <item quantity="other">"<b>"Excluir estes correios de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> às <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ro/strings.xml b/java/com/android/dialer/app/res/values-ro/strings.xml
index 93d0188..b85f849 100644
--- a/java/com/android/dialer/app/res/values-ro/strings.xml
+++ b/java/com/android/dialer/app/res/values-ro/strings.xml
@@ -81,6 +81,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Adăugați interval de așteptare"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Setări"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Creați comandă rapidă IU nouă"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Toată agenda"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Tastatura tactilă cu sunet"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Reveniți la apelul în curs"</string>
@@ -105,12 +106,15 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> secunde"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sec."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Anulați modul de acțiuni în lot"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"mesagerie vocală"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"mesaje vocale"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Da"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nu"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ștergeți"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Anulați"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Ștergeți cele <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> selectate?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selectate"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="few">"<b>"Ștergeți aceste mesaje vocale? "</b>"</item>
+      <item quantity="other">"<b>"Ștergeți aceste mesaje vocale? "</b>"</item>
+      <item quantity="one">"<b>"Ștergeți acest mesaj vocal? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> la <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ru/strings.xml b/java/com/android/dialer/app/res/values-ru/strings.xml
index 54278c4..91441cc 100644
--- a/java/com/android/dialer/app/res/values-ru/strings.xml
+++ b/java/com/android/dialer/app/res/values-ru/strings.xml
@@ -82,6 +82,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Добавить паузу"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Настройки"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Создать ярлык для нового интерфейса"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Все контакты"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Панель тонального набора"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Вернуться к текущему вызову"</string>
@@ -106,12 +107,16 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мин. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Отмена режима массового действия"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"голосовое сообщение"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"голосовые сообщения"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Да"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Нет"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Удалить"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Отмена"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Удалить <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Выбрано: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
+      <item quantity="few">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
+      <item quantity="many">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
+      <item quantity="other">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> в <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-si/strings.xml b/java/com/android/dialer/app/res/values-si/strings.xml
index 6363457..8a748d5 100644
--- a/java/com/android/dialer/app/res/values-si/strings.xml
+++ b/java/com/android/dialer/app/res/values-si/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"රැඳී සිටීම එක් කරන්න"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"සැකසීම්"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"සමාකෘතිය"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"නව UI කෙටිමග තනන්න"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"සියලුම සම්බන්ධතා"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ස්පර්ශ නාද යතුරුපෑඩය භාවිතා කරන්න"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"පවතින ඇමතුමට නැවත යන්න"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"තත් <xliff:g id="SECONDS">%s</xliff:g>"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"මිනි <xliff:g id="MINUTES">%s</xliff:g> තත් <xliff:g id="SECONDS">%s</xliff:g>"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"කාණ්ඩ ක්‍රියා ප්‍රකාරය අවලංගු කරන්න"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"හඬ තැපෑල"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"හඬ තැපැල්"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ඔව්"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"නැත"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"මකන්න"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"අවලංගු කරන්න"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"තෝරා ගත් <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> මකන්නද?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> තෝරා ගන්නා ලදි"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"මෙම හඬ තැපැල් මකන්නද? "</b>"</item>
+      <item quantity="other">"<b>"මෙම හඬ තැපැල් මකන්නද? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> දින <xliff:g id="TIME">%2$s</xliff:g>ට"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-sk/strings.xml b/java/com/android/dialer/app/res/values-sk/strings.xml
index f7bf423..e84febb 100644
--- a/java/com/android/dialer/app/res/values-sk/strings.xml
+++ b/java/com/android/dialer/app/res/values-sk/strings.xml
@@ -82,6 +82,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Pridať čakanie"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Nastavenia"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulátor"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Vyt. skratku na nové rozhranie"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Všetky kontakty"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Použiť dotykovú tónovú klávesnicu"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Návrat k prebiehajúcemu hovoru"</string>
@@ -106,12 +107,16 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Zrušiť režim hromadných akcií"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"hlasová správa"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"hlasové správy"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Áno"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nie"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Odstrániť"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Zrušiť"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Chcete odstrániť vybraté položky (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>)?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Vybraté: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="few">"<b>"Chcete odstrániť tieto hlasové správy? "</b>"</item>
+      <item quantity="many">"<b>"Chcete odstrániť tieto hlasové správy? "</b>"</item>
+      <item quantity="other">"<b>"Chcete odstrániť tieto hlasové správy? "</b>"</item>
+      <item quantity="one">"<b>"Chcete odstrániť túto hlasovú správu? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> o <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-sl/strings.xml b/java/com/android/dialer/app/res/values-sl/strings.xml
index d3c57dd..495b6e8 100644
--- a/java/com/android/dialer/app/res/values-sl/strings.xml
+++ b/java/com/android/dialer/app/res/values-sl/strings.xml
@@ -82,6 +82,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Dodaj premor"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Nastavitve"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Ustvari bliž. za novi up. vm."</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Vsi stiki"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Uporabi številčnico za tonsko klicanje"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Nazaj na klic, ki poteka"</string>
@@ -106,12 +107,16 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Prekliči način množičnega dejanja"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"sporočilo v odzivniku"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"sporočila v odzivniku"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Da"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Prekliči"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Želite izbrisati <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Št. izbranih: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
+      <item quantity="two">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
+      <item quantity="few">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
+      <item quantity="other">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ob <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-sq/strings.xml b/java/com/android/dialer/app/res/values-sq/strings.xml
index 8470445..809fd8a 100644
--- a/java/com/android/dialer/app/res/values-sq/strings.xml
+++ b/java/com/android/dialer/app/res/values-sq/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Shto një pritje"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Cilësimet"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simuluesi"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Krijo një shkurtore për ndërfaqen e re të përdoruesit"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Të gjitha kontaktet"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Përdor bllokun e tasteve"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Kthehu te telefonata"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sekonda"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. e <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Anulo modalitetin e veprimeve në grup"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"posta zanore"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"postat zanore"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Po"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Jo"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Fshi"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Anulo"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Të fshihen <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> të zgjedhura?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> të zgjedhura"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Të fshihen këto posta zanore? "</b>"</item>
+      <item quantity="one">"<b>"Të fshihet kjo postë zanore? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> në <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-sr/strings.xml b/java/com/android/dialer/app/res/values-sr/strings.xml
index 6cf7a7c..6f85c0b 100644
--- a/java/com/android/dialer/app/res/values-sr/strings.xml
+++ b/java/com/android/dialer/app/res/values-sr/strings.xml
@@ -81,6 +81,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Додај чекање"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Подешавања"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулатор"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Направите пречицу за нови UI"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Сви контакти"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Употребите бројчаник за тонско бирање"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Врати се на позив који је у току"</string>
@@ -105,12 +106,15 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Откажите режим групних радњи"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"говорну поруку"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"говорне поруке"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Да"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Не"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Избриши"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Откажи"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Желите ли да избришете изабрану(е) <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Изабраних: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Желите ли да избришете ове говорне поруке? "</b>"</item>
+      <item quantity="few">"<b>"Желите ли да избришете ове говорне поруке? "</b>"</item>
+      <item quantity="other">"<b>"Желите ли да избришете ове говорне поруке? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> у <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-sv/strings.xml b/java/com/android/dialer/app/res/values-sv/strings.xml
index 71ef3e5..e8446ca 100644
--- a/java/com/android/dialer/app/res/values-sv/strings.xml
+++ b/java/com/android/dialer/app/res/values-sv/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Lägg till väntetid"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Inställningar"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Skapa genväg till anv.gränssn."</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Alla kontakter"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Använd tonvalstelefon"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Återvänd till pågående samtal"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sekund"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Avbryt läget för massåtgärd"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"röstbrevlåda"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"röstmeddelanden"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nej"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Radera"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Avbryt"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Vill du radera markerade <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> har markerats"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Vill du ta bort dessa röstmeddelanden? "</b>"</item>
+      <item quantity="one">"<b>"Vill du ta bort det här röstmeddelandet? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-sw/strings.xml b/java/com/android/dialer/app/res/values-sw/strings.xml
index 9cbdd3e..142aaf0 100644
--- a/java/com/android/dialer/app/res/values-sw/strings.xml
+++ b/java/com/android/dialer/app/res/values-sw/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Ongeza kusubiri"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Mipangilio"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Kielelezo"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Unda Mkato Mpya wa Kiolesura"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Anwani zote"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Tumia kibao cha kuchapa cha sauti na kugusa"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Rudi kwa simu inayoendelea"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"Sekunde <xliff:g id="SECONDS">%s</xliff:g>"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"Dak <xliff:g id="MINUTES">%s</xliff:g> sek <xliff:g id="SECONDS">%s</xliff:g>"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Ghairi hali ya kutekeleza vitendo vingi"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ujumbe wa sauti"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ujumbe wa sauti"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ndiyo"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Hapana"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Futa"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Ghairi"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Je, ungependa kufuta <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> uliochagua?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> zimechaguliwa"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Je, unataka kufuta kila ujumbe wa sauti ulioonyeshwa? "</b>"</item>
+      <item quantity="one">"<b>"Je, unataka kufuta ujumbe huu wa sauti? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> saa <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ta/strings.xml b/java/com/android/dialer/app/res/values-ta/strings.xml
index a91088c..e270a3c 100644
--- a/java/com/android/dialer/app/res/values-ta/strings.xml
+++ b/java/com/android/dialer/app/res/values-ta/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"காத்திருப்பைச் சேர்"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"அமைப்பு"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"சிமுலேட்டர்"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"புதிய UI குறுக்குவழியை உருவாக்கு"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"எல்லா தொடர்புகளும்"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"டச் டோன் விசைப்பலகையைப் பயன்படுத்தவும்"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"செயலிலுள்ள அழைப்பிற்குத் திரும்பு"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> வி"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> நிமிடம் <xliff:g id="SECONDS">%s</xliff:g> வினாடி"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"தொகுப்புச் செயல்கள் பயன்முறையை ரத்துசெய்யும்"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"குரலஞ்சல்"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"குரலஞ்சல்கள்"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ஆம்"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"வேண்டாம்"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"நீக்கு"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ரத்துசெய்"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"தேர்ந்தெடுத்த <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>ஐ நீக்கவா?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> தேர்ந்தெடுக்கப்பட்டன"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"இந்தக் குரலஞ்சல்களை நீக்கவா? "</b>"</item>
+      <item quantity="one">"<b>"இந்தக் குரலஞ்சலை நீக்கவா? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> அன்று <xliff:g id="TIME">%2$s</xliff:g> மணிக்கு"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-te/strings.xml b/java/com/android/dialer/app/res/values-te/strings.xml
index aecc1c4..8d2c667 100644
--- a/java/com/android/dialer/app/res/values-te/strings.xml
+++ b/java/com/android/dialer/app/res/values-te/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"నిరీక్షణ సమయాన్ని జోడించు"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"సెట్టింగ్‌లు"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"సిములేటర్"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"కొత్త UI సత్వరమార్గం సృష్టించు"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"అన్ని పరిచయాలు"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"టచ్ టోన్ కీప్యాడ్‌ను ఉపయోగించండి"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"ప్రోగ్రెస్‌లో ఉన్న కాల్‌కు వెళ్లు"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> సెక"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> నిమి <xliff:g id="SECONDS">%s</xliff:g> సెక"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"సమూహ చర్యల మోడ్‌ను రద్దు చేస్తుంది"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"వాయిస్ మెయిల్"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"వాయిస్ మెయిల్‌లు"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"అవును"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"వద్దు"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"తొలగించు"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"రద్దు చేయి"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ఎంచుకున్న <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>ను తొలగించాలా?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ఎంచుకోబడ్డాయి"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ఈ వాయిస్ మెయిల్‌లను తొలగించాలా? "</b>"</item>
+      <item quantity="one">"<b>"ఈ వాయిస్ మెయిల్‌ను తొలగించాలా? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>కి"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-th/strings.xml b/java/com/android/dialer/app/res/values-th/strings.xml
index 58507b4..76a66e2 100644
--- a/java/com/android/dialer/app/res/values-th/strings.xml
+++ b/java/com/android/dialer/app/res/values-th/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"เพิ่มการรอ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"การตั้งค่า"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"เครื่องมือจำลอง"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"สร้างทางลัด UI ใหม่"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"รายชื่อติดต่อทั้งหมด"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ใช้ปุ่มกดสัญญาณเสียง"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"กลับไปคุยสายต่อ"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> นาที <xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"ยกเลิกโหมดการทำงานแบบกลุ่ม"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ข้อความเสียง"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ข้อความเสียง"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ใช่"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ไม่"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ลบ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ยกเลิก"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ลบ<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>ที่เลือกหรือไม่"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"เลือกไว้ <xliff:g id="NUMBER">%1$s</xliff:g> รายการ"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ลบข้อความเสียงเหล่านี้ไหม "</b>"</item>
+      <item quantity="one">"<b>"ลบข้อความเสียงนี้ไหม "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"วันที่ <xliff:g id="DATE">%1$s</xliff:g> เวลา <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-tl/strings.xml b/java/com/android/dialer/app/res/values-tl/strings.xml
index 9a8157f..51e7a66 100644
--- a/java/com/android/dialer/app/res/values-tl/strings.xml
+++ b/java/com/android/dialer/app/res/values-tl/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Magdagdag ng paghihintay"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Mga Setting"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Gawa ng Shortcut ng Bagong UI"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Lahat ng mga contact"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Gumamit ng touch tone na keypad"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Bumalik sa kasalukuyang tawag"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Kanselahin ang batch actions mode"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"voicemail"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"mga voicemail"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Oo"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Hindi"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"I-delete"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Kanselahin"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"I-delete ang napiling <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ang napili"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"I-delete ang mga voicemail na ito? "</b>"</item>
+      <item quantity="other">"<b>"I-delete ang mga voicemail na ito? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ng <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-tr/strings.xml b/java/com/android/dialer/app/res/values-tr/strings.xml
index 17bd664..1ff0128 100644
--- a/java/com/android/dialer/app/res/values-tr/strings.xml
+++ b/java/com/android/dialer/app/res/values-tr/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Bekleme ekle"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ayarlar"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simülatör"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Kull. Arayüzü Kısayolu Oluştur"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Tüm kişiler"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Telefon tuş takımını kullan"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Çağrıya dön"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sn."</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> dk. <xliff:g id="SECONDS">%s</xliff:g> sn."</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Toplu işlemler modu iptal edilir"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"sesli mesaj"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"sesli mesajlar"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Evet"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Hayır"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Sil"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"İptal"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Seçili <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> silinsin mi?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> öğe seçildi"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Bu sesli mesajlar silinsin mi? "</b>"</item>
+      <item quantity="one">"<b>"Bu sesli mesaj silinsin mi? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-uk/strings.xml b/java/com/android/dialer/app/res/values-uk/strings.xml
index a020a1f..b92970d 100644
--- a/java/com/android/dialer/app/res/values-uk/strings.xml
+++ b/java/com/android/dialer/app/res/values-uk/strings.xml
@@ -82,6 +82,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Додати паузу"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Налаштування"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Створити ярлик для нової дії"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Усі контакти"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Використовувати тональний набір"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Повернутися до поточного виклику"</string>
@@ -106,12 +107,16 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> с"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> хв <xliff:g id="SECONDS">%s</xliff:g> с"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Скасувати режим масових дій"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"голосова пошта"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"голосова пошта"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Так"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ні"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Видалити"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Скасувати"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Видалити вибране (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>)?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Вибрано <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
+      <item quantity="few">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
+      <item quantity="many">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
+      <item quantity="other">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> о <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-ur/strings.xml b/java/com/android/dialer/app/res/values-ur/strings.xml
index d696bd5..cb2eb9e 100644
--- a/java/com/android/dialer/app/res/values-ur/strings.xml
+++ b/java/com/android/dialer/app/res/values-ur/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"انتظار شامل کریں"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ترتیبات"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"‏نیا UI شارٹ کٹ تخلیق کریں"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"سبھی رابطے"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ٹچ ٹون کی پیڈ کا استعمال کریں"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"جاری کال پر واپس لوٹیں"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> سیکنڈ"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> منٹ <xliff:g id="SECONDS">%s</xliff:g> سیکنڈ"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"بیچ کاروائی موڈ منسوخ کریں"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"صوتی میل"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"صوتی میلز"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ہاں"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"نہیں"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"حذف کریں"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"منسوخ کریں"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"منتخب کردہ <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> حذف کریں؟"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> منتخب کردہ"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ان صوتی میلز کو حذف کریں؟ "</b>"</item>
+      <item quantity="one">"<b>"اس صوتی میل کو حذف کریں؟ "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> بوقت <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-uz/strings.xml b/java/com/android/dialer/app/res/values-uz/strings.xml
index aa645bf..c7d08f3 100644
--- a/java/com/android/dialer/app/res/values-uz/strings.xml
+++ b/java/com/android/dialer/app/res/values-uz/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Kutishni qo‘shish"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Sozlamalar"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulyator"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Yangi interfeys uchun yorliq"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Barcha kontaktlar"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Tovushli raqam tergich"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Amaldagi chaqiruvga qaytish"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> soniya"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> daq <xliff:g id="SECONDS">%s</xliff:g> son"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Yoppasiga bajariladigan amallar rejimini bekor qilish"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ovozli xabar"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ovozli xabarlar"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ha"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Yo‘q"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"O‘chirish"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Bekor qilish"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Tanlangan <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> o‘chirib tashlansinmi?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Tanlandi: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Bu ovozli xabarlar o‘chirib tashlansinmi? "</b>"</item>
+      <item quantity="one">"<b>"Bu ovozli xabar o‘chirib tashlansinmi? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-vi/strings.xml b/java/com/android/dialer/app/res/values-vi/strings.xml
index dda7c15..c79e1ed 100644
--- a/java/com/android/dialer/app/res/values-vi/strings.xml
+++ b/java/com/android/dialer/app/res/values-vi/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Thêm chờ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Cài đặt"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Trình mô phỏng"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Tạo phím tắt giao diện người dùng mới"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Tất cả liên hệ"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Sử dụng bàn phím số cảm ứng có âm"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Quay lại cuộc gọi đang thực hiện"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> giây"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> phút <xliff:g id="SECONDS">%s</xliff:g> giây"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Hủy chế độ tác vụ hàng loạt"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"thư thoại"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"thư thoại"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Có"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Không"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Xóa"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Hủy"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Xóa <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> đã chọn?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Đã chọn <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Xóa các thư thoại này? "</b>"</item>
+      <item quantity="one">"<b>"Xóa thư thoại này? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> lúc <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-zh-rCN/strings.xml b/java/com/android/dialer/app/res/values-zh-rCN/strings.xml
index 672614e..3262c1a 100644
--- a/java/com/android/dialer/app/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/app/res/values-zh-rCN/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"延长等待时间"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"设置"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"模拟器"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"创建可在新界面中使用的快捷键"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"所有联系人"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"使用按键式键盘"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"返回正在进行的通话"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> 分钟 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"取消批量操作模式"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"语音邮件"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"语音邮件"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"是"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"否"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"删除"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"取消"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"要删除所选的<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>吗？"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"已选择 <xliff:g id="NUMBER">%1$s</xliff:g> 封"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"要删除这些语音邮件吗？"</b>"</item>
+      <item quantity="one">"<b>"要删除这封语音邮件吗？"</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-zh-rHK/strings.xml b/java/com/android/dialer/app/res/values-zh-rHK/strings.xml
index f3dc44b..71e62ed 100644
--- a/java/com/android/dialer/app/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/app/res/values-zh-rHK/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"新增插播功能"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"設定"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"模擬器"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"建立新使用者介面捷徑"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"所有聯絡人"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"使用觸控音頻按鍵"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"返回進行中的通話"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"取消批量操作模式"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"留言"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"留言"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"是"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"否"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"刪除"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"取消"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"要刪除所選的<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>嗎？"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"已選取 <xliff:g id="NUMBER">%1$s</xliff:g> 個"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"要刪除這些留言嗎？"</b>"</item>
+      <item quantity="one">"<b>"要刪除此留言嗎？"</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-zh-rTW/strings.xml b/java/com/android/dialer/app/res/values-zh-rTW/strings.xml
index 473955c..9178dcf 100644
--- a/java/com/android/dialer/app/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/app/res/values-zh-rTW/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"延長等待時間"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"設定"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"模擬工具"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"建立新版 UI 捷徑"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"所有聯絡人"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"使用觸控音按鍵"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"返回進行中的通話"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"取消批次操作模式"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"語音留言"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"語音留言"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"是"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"否"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"刪除"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"取消"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"要刪除選取的<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>嗎？"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"已選取 <xliff:g id="NUMBER">%1$s</xliff:g> 個"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"要刪除這些語音留言嗎？"</b>"</item>
+      <item quantity="one">"<b>"要刪除這則語音留言嗎？"</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values-zu/strings.xml b/java/com/android/dialer/app/res/values-zu/strings.xml
index 93843aa..f52f597 100644
--- a/java/com/android/dialer/app/res/values-zu/strings.xml
+++ b/java/com/android/dialer/app/res/values-zu/strings.xml
@@ -80,6 +80,7 @@
     <string name="add_wait" msgid="1177723010768282578">"Yengeza ukulinda"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Izilungiselelo"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Isilingisi"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Dala isinqamuleli esisha se-UI"</string>
     <string name="menu_allContacts" msgid="8544950176866640863">"Bonke othintana nabo"</string>
     <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Sebenzisa ikhiphedi yethoni yokuthinta"</string>
     <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Buyela kukholi eqhubekayo"</string>
@@ -104,12 +105,14 @@
     <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> isekhondi"</string>
     <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> amaminithi <xliff:g id="SECONDS">%s</xliff:g> amasekhondi"</string>
     <string name="description_cancel_multi_select" msgid="3930475950253360461">"Khansela imodi lezenzo zeqoqo"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ivoyisimeyili"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ama-meyli ezwi"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Yebo"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Cha"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Susa"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Khansela"</string>
     <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Susa okukhethiwe <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
     <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Engu-<xliff:g id="NUMBER">%1$s</xliff:g> ekhethiwe"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Sula lawa mavoyisimeyili? "</b>"</item>
+      <item quantity="other">"<b>"Sula lawa mavoyisimeyili? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ngo-<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values/dimens.xml b/java/com/android/dialer/app/res/values/dimens.xml
index 57c43eb..90a8bb8 100644
--- a/java/com/android/dialer/app/res/values/dimens.xml
+++ b/java/com/android/dialer/app/res/values/dimens.xml
@@ -24,6 +24,11 @@
   -->
   <dimen name="remove_text_size">16dp</dimen>
 
+  <!-- Select All/Multi Select -->
+  <dimen name="select_all_text_size">14sp</dimen>
+  <dimen name="select_all_icon_padding">16dp</dimen>
+  <dimen name="select_all_text_left_padding">18dp</dimen>
+
   <!-- Call Log -->
   <dimen name="call_log_horizontal_margin">8dp</dimen>
   <dimen name="call_log_call_action_size">32dp</dimen>
diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml
index 6110601..e02c6fb 100644
--- a/java/com/android/dialer/app/res/values/strings.xml
+++ b/java/com/android/dialer/app/res/values/strings.xml
@@ -114,7 +114,7 @@
   <!-- Title of the notification of new voicemails. [CHAR LIMIT=30] -->
   <plurals name="notification_voicemail_title">
     <item quantity="one">Voicemail</item>
-        <item quantity="other">
+    <item quantity="other">
             <xliff:g id="count">%1$d</xliff:g>
             Voicemails
         </item>
@@ -131,12 +131,12 @@
 
        [CHAR LIMIT=10]
    -->
-    <string name="notification_voicemail_callers_list"><xliff:g id="newer_callers">%1$s</xliff:g>,
+  <string name="notification_voicemail_callers_list"><xliff:g id="newer_callers">%1$s</xliff:g>,
         <xliff:g id="older_caller">%2$s</xliff:g>
     </string>
 
   <!-- Text used in the ticker to notify the user of the latest voicemail. [CHAR LIMIT=30] -->
-    <string name="notification_new_voicemail_ticker">New voicemail from
+  <string name="notification_new_voicemail_ticker">New voicemail from
         <xliff:g id="caller">%1$s</xliff:g>
     </string>
 
@@ -165,7 +165,7 @@
   <string name="call_log_missed_header">Missed calls only</string>
 
   <!-- The counter for calls in a group and the date of the latest call as shown in the call log [CHAR LIMIT=15] -->
-    <string name="call_log_item_count_and_date">(<xliff:g id="count">%1$d</xliff:g>)
+  <string name="call_log_item_count_and_date">(<xliff:g id="count">%1$d</xliff:g>)
         <xliff:g id="date">%2$s</xliff:g>
     </string>
 
@@ -258,6 +258,9 @@
        and testing. [CHAR LIMIT=30]-->
   <string name="simulator_submenu_label">Simulator</string>
 
+  <!-- Label for the menu item that installs a shortcut for the new UI. [CHAR LIMIT=30] -->
+  <string name="new_ui_launcher_shortcut_label">Create New UI Shortcut</string>
+
   <!-- Menu item to display all contacts [CHAR LIMIT=30] -->
   <string name="menu_allContacts">All contacts</string>
 
@@ -395,14 +398,18 @@
        [CHAR LIMIT=NONE] -->
   <string name="description_cancel_multi_select">Cancel batch actions mode</string>
 
-  <string name="voicemailMultiSelectVoicemail">voicemail</string>
-  <string name="voicemailMultiSelectVoicemails">voicemails</string>
-  <string name="voicemailMultiSelectDeleteConfirm">Yes</string>
-  <string name="voicemailMultiSelectDeleteCancel">No</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Delete</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancel</string>
   <string name="voicemailMultiSelectDialogTitle">Delete selected <xliff:g id="voicemailorvoicemails">%1$s</xliff:g>?</string>
 
   <string name="voicemailMultiSelectActionBarTitle"><xliff:g id="number">%1$s</xliff:g> selected</string>
 
+  <!-- Alert dialog title to accept or decline deleting voicemail(s). -->
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Delete this voicemail? </b></item>
+    <item quantity="other"><b>Delete these voicemails? </b></item>
+  </plurals>
+
   <!-- The string 'Today'. This value is used in the voicemailCallLogDateTimeFormat rather than an
        explicit date string, e.g. Jul 25, 2014, in the event that a voicemail was created on the
        current day -->
@@ -516,7 +523,7 @@
   <string name="favorite_hidden_undo">Undo</string>
 
   <!-- Shortcut item used to call a number directly from search -->
-    <string name="search_shortcut_call_number">Call
+  <string name="search_shortcut_call_number">Call
         <xliff:g id="number">%s</xliff:g>
     </string>
 
@@ -579,13 +586,13 @@
 
   <!-- Button text for the button displayed underneath an entry in the call log, which when
        tapped triggers a return call to the named user. [CHAR LIMIT=30] -->
-    <string name="call_log_action_call">
+  <string name="call_log_action_call">
         Call <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
-    <!-- String describing an incoming missed call entry in the call log.
-       Note: AccessibilityServices uses this attribute to announce what the view represents.
-       [CHAR LIMIT=NONE] -->
+  <!-- String describing an incoming missed call entry in the call log.
+     Note: AccessibilityServices uses this attribute to announce what the view represents.
+     [CHAR LIMIT=NONE] -->
   <string name="description_incoming_missed_call">Missed call from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>, <xliff:g example="Mobile" id="typeOrLocation">^2</xliff:g>, <xliff:g example="2 min ago" id="timeOfCall">^3</xliff:g>, <xliff:g example="on SIM 1" id="phoneAccount">^4</xliff:g>.</string>
 
   <!-- String describing an incoming answered call entry in the call log.
@@ -621,7 +628,7 @@
        action triggers a return call to the named user.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
        [CHAR LIMIT=NONE] -->
-    <string name="description_call_action">
+  <string name="description_call_action">
         Call <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
@@ -629,7 +636,7 @@
        action triggers a return video call to the named person/number.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
        [CHAR LIMIT=NONE] -->
-    <string name="description_video_call_action">
+  <string name="description_video_call_action">
         Video call <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>.
     </string>
 
@@ -638,21 +645,21 @@
        triggers playing back the voicemail.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
        [CHAR LIMIT=NONE] -->
-    <string name="description_voicemail_action">
+  <string name="description_voicemail_action">
         Listen to voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
   <!-- String describing the "play voicemail" action for an entry in the call log.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
        [CHAR LIMIT=NONE] -->
-    <string name="description_voicemail_play">
+  <string name="description_voicemail_play">
         Play voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
   <!-- String describing the "pause voicemail" action for an entry in the call log.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
        [CHAR LIMIT=NONE] -->
-    <string name="description_voicemail_pause">
+  <string name="description_voicemail_pause">
         Pause voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
@@ -660,7 +667,7 @@
   <!-- String describing the "delete voicemail" action for an entry in the call log.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
        [CHAR LIMIT=NONE] -->
-    <string name="description_voicemail_delete">
+  <string name="description_voicemail_delete">
         Delete voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
@@ -674,14 +681,14 @@
 
   <!-- Description for the "create new contact" action for an entry in the call log. This action
        opens a screen for creating a new contact for this name or number. [CHAR LIMIT=NONE] -->
-    <string name="description_create_new_contact_action">
+  <string name="description_create_new_contact_action">
         Create contact for <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
   <!-- Description for the "add to existing contact" action for an entry in the call log. This
        action opens a screen for adding this name or number to an existing contact.
        [CHAR LIMIT=NONE] -->
-    <string name="description_add_to_existing_contact_action">
+  <string name="description_add_to_existing_contact_action">
         Add <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g> to existing contact
     </string>
 
@@ -689,7 +696,7 @@
        displays the call details screen for an entry in the call log.  This shows the calls to
        and from the specified number associated with the call log entry.
        [CHAR LIMIT=NONE] -->
-    <string name="description_details_action">
+  <string name="description_details_action">
         Call details for <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
@@ -798,14 +805,14 @@
 
   <!-- Label for a section describing that call blocking is temporarily disabled because an
        emergency call was made. [CHAR LIMIT=50] -->
-    <string name="blocked_numbers_disabled_emergency_header_label">
+  <string name="blocked_numbers_disabled_emergency_header_label">
         Call blocking temporarily off
     </string>
 
   <!-- Description that call blocking is temporarily disabled because the user called an
        emergency number, and explains that call blocking will be re-enabled after a buffer
        period has passed. [CHAR LIMIT=NONE] -->
-    <string name="blocked_numbers_disabled_emergency_desc">
+  <string name="blocked_numbers_disabled_emergency_desc">
         Call blocking has been disabled because you contacted emergency services from this phone
         within the last 48 hours. It will be automatically reenabled once the 48 hour period
         expires.
@@ -818,7 +825,7 @@
   <!-- Text informing the user they have previously marked contacts to be sent to voicemail.
        This will be followed by two buttons, 1) to view who is marked to be sent to voicemail
        and 2) importing these settings to Dialer's block list. [CHAR LIMIT=NONE] -->
-    <string name="blocked_call_settings_import_description">
+  <string name="blocked_call_settings_import_description">
         You previously marked some callers to be automatically sent to voicemail via other apps.
     </string>
 
@@ -840,13 +847,13 @@
 
   <!-- Footer message of number blocking screen with visual voicemail active.
       [CHAR LIMIT=NONE] -->
-    <string name="block_number_footer_message_vvm">
+  <string name="block_number_footer_message_vvm">
         Calls from these numbers will be blocked and voicemails will be automatically deleted.
     </string>
 
   <!-- Footer message of number blocking screen with no visual voicemail.
        [CHAR LIMIT=NONE] -->
-    <string name="block_number_footer_message_no_vvm">
+  <string name="block_number_footer_message_no_vvm">
          Calls from these numbers will be blocked, but they may still be able to leave you voicemails.
     </string>
 
@@ -855,7 +862,7 @@
 
   <!-- Error message shown when user tries to add a number to the block list that was already
       blocked. [CHAR LIMIT=64] -->
-    <string name="alreadyBlocked"><xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>
+  <string name="alreadyBlocked"><xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>
         is already blocked.</string>
 
   <!-- Label for the phone account settings [CHAR LIMIT=30] -->
diff --git a/java/com/android/dialer/app/res/values/styles.xml b/java/com/android/dialer/app/res/values/styles.xml
index 592f06d..e0122e8 100644
--- a/java/com/android/dialer/app/res/values/styles.xml
+++ b/java/com/android/dialer/app/res/values/styles.xml
@@ -16,6 +16,11 @@
   -->
 <resources>
 
+  <style name="AlertDialogCustom" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <item name="android:colorPrimary">@color/dialtacts_theme_color</item>
+    <item name="android:colorAccent">@color/dialtacts_theme_color</item>
+  </style>
+
   <style name="DialtactsTheme" parent="DialerThemeBase">
 
     <!-- Styles that require AppCompat compatibility, remember to update both sets -->
@@ -28,10 +33,8 @@
     <item name="actionModeStyle">@style/ActionModeStyle</item>
     <item name="android:actionModeStyle">@style/ActionModeStyle</item>
 
-
     <item name="android:windowContentOverlay">@null</item>
     <item name="android:overlapAnchor">true</item>
-    <item name="android:homeAsUpIndicator">@drawable/quantum_ic_arrow_back_vd_theme_24</item>
 
     <item name="android:listViewStyle">@style/ListViewStyle</item>
     <item name="list_section_header_height">32dip</item>
diff --git a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
index ffbae71..a7cfc0c 100644
--- a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
+++ b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
@@ -27,7 +27,7 @@
 import android.support.v4.os.UserManagerCompat;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
-import com.android.dialer.app.calllog.DefaultVoicemailNotifier;
+import com.android.dialer.app.calllog.LegacyVoicemailNotifier;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.PerAccountSharedPreferences;
@@ -35,7 +35,7 @@
 
 /**
  * Receives {@link TelephonyManager#ACTION_SHOW_VOICEMAIL_NOTIFICATION}, and forwards to {@link
- * DefaultVoicemailNotifier}. Will ignore the notification if the account has visual voicemail.
+ * LegacyVoicemailNotifier}. Will ignore the notification if the account has visual voicemail.
  * Legacy voicemail is the traditional, non-visual, dial-in voicemail.
  */
 @TargetApi(VERSION_CODES.O)
@@ -78,7 +78,7 @@
 
     if (count == 0) {
       LogUtil.i("LegacyVoicemailNotificationReceiver.onReceive", "clearing notification");
-      new DefaultVoicemailNotifier(context).cancelLegacyNotification();
+      LegacyVoicemailNotifier.cancelNotification(context);
       return;
     }
 
@@ -99,14 +99,14 @@
         intent.getParcelableExtra(TelephonyManager.EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT);
 
     LogUtil.i("LegacyVoicemailNotificationReceiver.onReceive", "sending notification");
-    new DefaultVoicemailNotifier(context)
-        .notifyLegacyVoicemail(
-            phoneAccountHandle,
-            count,
-            voicemailNumber,
-            callVoicemailIntent,
-            voicemailSettingIntent,
-            intent.getBooleanExtra(EXTRA_IS_REFRESH, false));
+    LegacyVoicemailNotifier.showNotification(
+        context,
+        phoneAccountHandle,
+        count,
+        voicemailNumber,
+        callVoicemailIntent,
+        voicemailSettingIntent,
+        intent.getBooleanExtra(EXTRA_IS_REFRESH, false));
   }
 
   private static boolean hasVoicemailCountChanged(
diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
index 686e3e8..5c9bc01 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
@@ -47,12 +47,12 @@
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogListItemViewHolder;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.AsyncTaskExecutor;
 import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import com.android.dialer.common.concurrent.DialerExecutor;
 import com.android.dialer.common.concurrent.DialerExecutors;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
@@ -87,7 +87,6 @@
  * calls into this class from outside must be done from the main UI thread.
  */
 @NotThreadSafe
-@VisibleForTesting
 @TargetApi(VERSION_CODES.M)
 public class VoicemailPlaybackPresenter
     implements MediaPlayer.OnPreparedListener,
@@ -502,7 +501,7 @@
    * will call {@link #onError()} otherwise.
    */
   protected void prepareContent() {
-    if (mView == null) {
+    if (mView == null || mContext == null) {
       return;
     }
     LogUtil.d("VoicemailPlaybackPresenter.prepareContent", null);
diff --git a/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java b/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
index 48602ea..909de70 100644
--- a/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
@@ -47,6 +47,12 @@
   @Nullable
   public static VoicemailErrorMessage create(
       Context context, VoicemailStatus status, final VoicemailStatusReader statusReader) {
+    VoicemailErrorMessage tosMessage =
+        new VoicemailTosMessageCreator(context, status, statusReader).maybeCreateTosMessage();
+    if (tosMessage != null) {
+      return tosMessage;
+    }
+
     if (Status.CONFIGURATION_STATE_OK == status.configurationState
         && Status.DATA_CHANNEL_STATE_OK == status.dataChannelState
         && Status.NOTIFICATION_CHANNEL_STATE_OK == status.notificationChannelState) {
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java b/java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java
index 2ff182b..3a169e4 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java
@@ -26,8 +26,8 @@
 import android.telephony.TelephonyManager;
 import com.android.contacts.common.compat.TelephonyManagerCompat;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java
new file mode 100644
index 0000000..3f0ed1f
--- /dev/null
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java
@@ -0,0 +1,301 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.app.voicemail.error;
+
+import android.app.AlertDialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.TelephonyManager;
+import android.view.View;
+import android.view.View.OnClickListener;
+import com.android.contacts.common.compat.TelephonyManagerCompat;
+import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action;
+import com.android.dialer.buildtype.BuildType;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.voicemail.VisualVoicemailTypeExtensions;
+import com.android.voicemail.VoicemailClient;
+import com.android.voicemail.VoicemailComponent;
+import java.util.Locale;
+
+/**
+ * Create error message from {@link VoicemailStatus} for voicemail. This is will show different
+ * terms of service for Verizon and for other carriers.
+ */
+public class VoicemailTosMessageCreator {
+  // Flag to check which version of the Verizon ToS that the user has accepted.
+  public static final String VVM3_TOS_VERSION_ACCEPTED_KEY = "vvm3_tos_version_accepted";
+
+  // Flag to check which version of the Google Dialer ToS that the user has accepted.
+  public static final String DIALER_TOS_VERSION_ACCEPTED_KEY = "dialer_tos_version_accepted";
+
+  public static final int CURRENT_VVM3_TOS_VERSION = 2;
+  public static final int CURRENT_DIALER_TOS_VERSION = 1;
+
+  private static final String ISO639_SPANISH = "es";
+
+  private final Context context;
+  private final VoicemailStatus status;
+  private final VoicemailStatusReader statusReader;
+  private final SharedPreferences preferences;
+
+  VoicemailTosMessageCreator(
+      final Context context,
+      final VoicemailStatus status,
+      final VoicemailStatusReader statusReader) {
+    this.context = context;
+    this.status = status;
+    this.statusReader = statusReader;
+    this.preferences = PreferenceManager.getDefaultSharedPreferences(context);
+  }
+
+  @Nullable
+  VoicemailErrorMessage maybeCreateTosMessage() {
+    // TODO: add filtering based on carrier
+    if (hasAcceptedTos()) {
+      return null;
+    }
+    // TODO: temporarily skip the terms of service for dogfood builds
+    if (BuildType.get() == BuildType.DOGFOOD) {
+      LogUtil.i(
+          "VoicemailTosMessageCreator.maybeCreateTosMessage",
+          "Skipping voicemail ToS for dogfood build");
+      return null;
+    }
+    logTosCreatedImpression();
+
+    return new VoicemailTosMessage(
+            getTosTitle(),
+            getTosMessage(),
+            new Action(
+                getDeclineText(),
+                new OnClickListener() {
+                  @Override
+                  public void onClick(View v) {
+                    LogUtil.i("VoicemailTosMessageCreator.maybeShowTosMessage", "decline clicked");
+                    PhoneAccountHandle handle =
+                        new PhoneAccountHandle(
+                            ComponentName.unflattenFromString(status.phoneAccountComponentName),
+                            status.phoneAccountId);
+                    logTosDeclinedImpression();
+                    showDeclineTosDialog(handle);
+                  }
+                }),
+            new Action(
+                getAcceptText(),
+                new OnClickListener() {
+                  @Override
+                  public void onClick(View v) {
+                    LogUtil.i("VoicemailTosMessageCreator.maybeShowTosMessage", "accept clicked");
+                    recordTosAcceptance();
+                    logTosAcceptedImpression();
+                    statusReader.refresh();
+                  }
+                },
+                true /* raised */))
+        .setModal(true);
+  }
+
+  private void showDeclineTosDialog(final PhoneAccountHandle handle) {
+    if (isVvm3() && Vvm3VoicemailMessageCreator.PIN_NOT_SET == status.configurationState) {
+      LogUtil.i(
+          "VoicemailTosMessageCreator.showDeclineTosDialog", "PIN_NOT_SET, showing set PIN dialog");
+      showSetPinBeforeDeclineDialog();
+      return;
+    }
+    LogUtil.i(
+        "VoicemailTosMessageCreator.showDeclineVerizonTosDialog",
+        "showing decline ToS dialog, status=" + status);
+    final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    builder.setMessage(getTosDeclinedDialogMessageId());
+    builder.setPositiveButton(
+        getTosDeclinedDialogDowngradeId(),
+        new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINED);
+            VoicemailClient voicemailClient = VoicemailComponent.get(context).getVoicemailClient();
+            if (voicemailClient.isVoicemailModuleEnabled()) {
+              voicemailClient.setVoicemailEnabled(context, status.getPhoneAccountHandle(), false);
+            } else {
+              TelephonyManagerCompat.setVisualVoicemailEnabled(telephonyManager, handle, false);
+            }
+          }
+        });
+
+    builder.setNegativeButton(
+        android.R.string.cancel,
+        new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            dialog.dismiss();
+          }
+        });
+
+    builder.setCancelable(true);
+    builder.show();
+  }
+
+  private void showSetPinBeforeDeclineDialog() {
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    builder.setMessage(R.string.verizon_terms_and_conditions_decline_set_pin_dialog_message);
+    builder.setPositiveButton(
+        R.string.verizon_terms_and_conditions_decline_set_pin_dialog_set_pin,
+        new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            Logger.get(context)
+                .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINE_CHANGE_PIN_SHOWN);
+            Intent intent = new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL);
+            context.startActivity(intent);
+          }
+        });
+
+    builder.setNegativeButton(
+        android.R.string.cancel,
+        new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            dialog.dismiss();
+          }
+        });
+
+    builder.setCancelable(true);
+    builder.show();
+  }
+
+  private boolean isVvm3() {
+    return VisualVoicemailTypeExtensions.VVM_TYPE_VVM3.equals(status.type);
+  }
+
+  private boolean useSpanish() {
+    return Locale.getDefault().getLanguage().equals(new Locale(ISO639_SPANISH).getLanguage());
+  }
+
+  private boolean hasAcceptedTos() {
+    if (isVvm3()) {
+      return preferences.getInt(VVM3_TOS_VERSION_ACCEPTED_KEY, 0) >= CURRENT_VVM3_TOS_VERSION;
+    } else {
+      return preferences.getInt(DIALER_TOS_VERSION_ACCEPTED_KEY, 0) >= CURRENT_DIALER_TOS_VERSION;
+    }
+  }
+
+  private void recordTosAcceptance() {
+    if (isVvm3()) {
+      preferences.edit().putInt(VVM3_TOS_VERSION_ACCEPTED_KEY, CURRENT_VVM3_TOS_VERSION).apply();
+    } else {
+      preferences
+          .edit()
+          .putInt(DIALER_TOS_VERSION_ACCEPTED_KEY, CURRENT_DIALER_TOS_VERSION)
+          .apply();
+    }
+  }
+
+  private void logTosCreatedImpression() {
+    if (isVvm3()) {
+      Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_V2_CREATED);
+    } else {
+      Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_DIALER_TOS_CREATED);
+    }
+  }
+
+  private void logTosDeclinedImpression() {
+    if (isVvm3()) {
+      Logger.get(context)
+          .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_V2_DECLINE_CLICKED);
+    } else {
+      Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_DIALER_TOS_DECLINE_CLICKED);
+    }
+  }
+
+  private void logTosAcceptedImpression() {
+    if (isVvm3()) {
+      Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_V2_ACCEPTED);
+    } else {
+      Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_DIALER_TOS_ACCEPTED);
+    }
+  }
+
+  private CharSequence getVvm3Tos() {
+    return useSpanish()
+        ? context.getString(R.string.verizon_terms_and_conditions_1_1_spanish)
+        : context.getString(R.string.verizon_terms_and_conditions_1_1_english);
+  }
+
+  private CharSequence getDialerTos() {
+    return useSpanish()
+        ? context.getString(R.string.dialer_terms_and_conditions_1_0_spanish)
+        : context.getString(R.string.dialer_terms_and_conditions_1_0_english);
+  }
+
+  private CharSequence getAcceptText() {
+    if (isVvm3()) {
+      return useSpanish()
+          ? context.getString(R.string.verizon_terms_and_conditions_accept_spanish)
+          : context.getString(R.string.verizon_terms_and_conditions_accept_english);
+    } else {
+      return useSpanish()
+          ? context.getString(R.string.dialer_terms_and_conditions_accept_spanish)
+          : context.getString(R.string.dialer_terms_and_conditions_accept_english);
+    }
+  }
+
+  private CharSequence getDeclineText() {
+    if (isVvm3()) {
+      return useSpanish()
+          ? context.getString(R.string.verizon_terms_and_conditions_decline_spanish)
+          : context.getString(R.string.verizon_terms_and_conditions_decline_english);
+    } else {
+      return useSpanish()
+          ? context.getString(R.string.dialer_terms_and_conditions_decline_spanish)
+          : context.getString(R.string.dialer_terms_and_conditions_decline_english);
+    }
+  }
+
+  private String getTosTitle() {
+    return isVvm3()
+        ? context.getString(R.string.verizon_terms_and_conditions_title)
+        : context.getString(R.string.dialer_terms_and_conditions_title);
+  }
+
+  private String getTosMessage() {
+    return isVvm3()
+        ? context.getString(
+            R.string.verizon_terms_and_conditions_message, getDialerTos(), getVvm3Tos())
+        : context.getString(R.string.dialer_terms_and_conditions_message, getDialerTos());
+  }
+
+  private int getTosDeclinedDialogMessageId() {
+    return isVvm3()
+        ? R.string.verizon_terms_and_conditions_decline_dialog_message
+        : R.string.dialer_terms_and_conditions_decline_dialog_message;
+  }
+
+  private int getTosDeclinedDialogDowngradeId() {
+    return isVvm3()
+        ? R.string.verizon_terms_and_conditions_decline_dialog_downgrade
+        : R.string.dialer_terms_and_conditions_decline_dialog_downgrade;
+  }
+}
diff --git a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
index 132e8a3..e639eff 100644
--- a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
@@ -16,32 +16,19 @@
 
 package com.android.dialer.app.voicemail.error;
 
-import android.app.AlertDialog;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build.VERSION_CODES;
-import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
-import android.support.annotation.VisibleForTesting;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.TelephonyManager;
 import android.view.View;
 import android.view.View.OnClickListener;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action;
-import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
-import com.android.voicemail.VoicemailClient;
-import com.android.voicemail.VoicemailComponent;
-import java.util.Locale;
 
 /**
  * Create error message from {@link VoicemailStatus} for VVM3 visual voicemail. VVM3 is used only by
@@ -84,15 +71,13 @@
   public static final int PIN_NOT_SET = -100;
   public static final int SUBSCRIBER_UNKNOWN = -99;
 
-  private static final String ISO639_SPANISH = "es";
-  @VisibleForTesting static final String VVM3_TOS_ACCEPTANCE_FLAG_KEY = "vvm3_tos_acceptance_flag";
-
   @Nullable
   public static VoicemailErrorMessage create(
       final Context context,
       final VoicemailStatus status,
       final VoicemailStatusReader statusReader) {
-    VoicemailErrorMessage tosMessage = maybeShowTosMessage(context, status, statusReader);
+    VoicemailErrorMessage tosMessage =
+        new VoicemailTosMessageCreator(context, status, statusReader).maybeCreateTosMessage();
     if (tosMessage != null) {
       return tosMessage;
     }
@@ -299,135 +284,4 @@
           }
         });
   }
-
-  @Nullable
-  private static VoicemailErrorMessage maybeShowTosMessage(
-      final Context context,
-      final VoicemailStatus status,
-      final VoicemailStatusReader statusReader) {
-    final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-    if (preferences.getBoolean(VVM3_TOS_ACCEPTANCE_FLAG_KEY, false)) {
-      return null;
-    }
-    Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_SHOWN);
-
-    CharSequence termsAndConditions;
-    CharSequence acceptText;
-    CharSequence declineText;
-    // TODO(b/29082671): use LocaleList
-    if (Locale.getDefault().getLanguage().equals(new Locale(ISO639_SPANISH).getLanguage())) {
-      // Spanish
-      termsAndConditions = context.getString(R.string.verizon_terms_and_conditions_1_1_spanish);
-      acceptText = context.getString(R.string.verizon_terms_and_conditions_accept_spanish);
-      declineText = context.getString(R.string.verizon_terms_and_conditions_decline_spanish);
-    } else {
-      termsAndConditions = context.getString(R.string.verizon_terms_and_conditions_1_1_english);
-      acceptText = context.getString(R.string.verizon_terms_and_conditions_accept_english);
-      declineText = context.getString(R.string.verizon_terms_and_conditions_decline_english);
-    }
-
-    return new VoicemailTosMessage(
-            context.getString(R.string.verizon_terms_and_conditions_title),
-            context.getString(R.string.verizon_terms_and_conditions_message, termsAndConditions),
-            new Action(
-                declineText,
-                new OnClickListener() {
-                  @Override
-                  public void onClick(View v) {
-                    LogUtil.i("Vvm3VoicemailMessageCreator.maybeShowTosMessage", "decline clicked");
-                    PhoneAccountHandle handle =
-                        new PhoneAccountHandle(
-                            ComponentName.unflattenFromString(status.phoneAccountComponentName),
-                            status.phoneAccountId);
-                    Logger.get(context)
-                        .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINE_CLICKED);
-                    showDeclineTosDialog(context, handle, status);
-                  }
-                }),
-            new Action(
-                acceptText,
-                new OnClickListener() {
-                  @Override
-                  public void onClick(View v) {
-                    LogUtil.i("Vvm3VoicemailMessageCreator.maybeShowTosMessage", "accept clicked");
-                    preferences.edit().putBoolean(VVM3_TOS_ACCEPTANCE_FLAG_KEY, true).apply();
-                    Logger.get(context)
-                        .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_ACCEPTED);
-                    statusReader.refresh();
-                  }
-                },
-                true /* raised */))
-        .setModal(true);
-  }
-
-  private static void showDeclineTosDialog(
-      final Context context, final PhoneAccountHandle handle, VoicemailStatus status) {
-    if (PIN_NOT_SET == status.configurationState) {
-      LogUtil.i(
-          "Vvm3VoicemailMessageCreator.showDeclineTosDialog",
-          "PIN_NOT_SET, showing set PIN dialog");
-      showSetPinBeforeDeclineDialog(context);
-      return;
-    }
-    LogUtil.i(
-        "Vvm3VoicemailMessageCreator.showDeclineTosDialog",
-        "showing decline ToS dialog, status=" + status);
-    final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setMessage(R.string.verizon_terms_and_conditions_decline_dialog_message);
-    builder.setPositiveButton(
-        R.string.verizon_terms_and_conditions_decline_dialog_downgrade,
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINED);
-            VoicemailClient voicemailClient = VoicemailComponent.get(context).getVoicemailClient();
-            if (voicemailClient.isVoicemailModuleEnabled()) {
-              voicemailClient.setVoicemailEnabled(context, status.getPhoneAccountHandle(), false);
-            } else {
-              TelephonyManagerCompat.setVisualVoicemailEnabled(telephonyManager, handle, false);
-            }
-          }
-        });
-
-    builder.setNegativeButton(
-        android.R.string.cancel,
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            dialog.dismiss();
-          }
-        });
-
-    builder.setCancelable(true);
-    builder.show();
-  }
-
-  private static void showSetPinBeforeDeclineDialog(final Context context) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setMessage(R.string.verizon_terms_and_conditions_decline_set_pin_dialog_message);
-    builder.setPositiveButton(
-        R.string.verizon_terms_and_conditions_decline_set_pin_dialog_set_pin,
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            Logger.get(context)
-                .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINE_CHANGE_PIN_SHOWN);
-            Intent intent = new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL);
-            context.startActivity(intent);
-          }
-        });
-
-    builder.setNegativeButton(
-        android.R.string.cancel,
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            dialog.dismiss();
-          }
-        });
-
-    builder.setCancelable(true);
-    builder.show();
-  }
 }
diff --git a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml
index c193eaa..a082e8e 100644
--- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -68,4 +82,4 @@
       android:text="@string/verizon_terms_and_conditions_accept_english"/>
   </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-af/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-af/strings.xml
index 9c64735..ab951eb 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-af/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-af/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiveer tans visuele stemboodskapdiens"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Jy sal dalk nie stemboodskapkennisgewings ontvang totdat visuele stemboodskapdiens heeltemal geaktiveer is nie. Bel stemboodskapdiens om nuwe boodskappe te kry totdat stemboodskapdiens volledig geaktiveer is."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Kan nie visuele stemboodskapdiens aktiveer nie"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Maak seker jou foon het sellulêre verbinding en probeer weer."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Maak seker jou foon het ’n mobiele netwerkverbinding en probeer weer."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Skakel vliegtuigmodus af en probeer weer."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Geen verbinding nie"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Jy sal nie van nuwe stemboodskappe in kennis gestel word nie. As jy op Wi-Fi is, kan jy jou stemboodskapdiens nagaan deur nou te sinkroniseer."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Jy sal nie van nuwe stemboodskappe in kennis gestel word nie. As jy op Wi-Fi is, kan jy jou stemboodskapdiens nagaan deur nou te sinkroniseer."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Jy sal nie van nuwe stemboodskappe in kennis gestel word nie. Skakel vliegtuigmodus af om jou stemboodskapdiens te sinkroniseer."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Jou foon benodig \'n sellulêre dataverbinding om stemboodskapdiens na te gaan."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Jou foon benodig \'n mobiele dataverbinding om stemboodskapdiens na te gaan"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Kan nie visuele stemboodskapdiens aktiveer nie"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Kan nie visuele stemboodskapdiens opdateer nie"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Probeer weer wanneer jou Wi-Fi- of sellulêre verbinding beter is. Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Probeer weer wanneer jou sellulêredataverbinding beter is. Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Probeer weer wanneer jou Wi-Fi- of mobiele dataverbinding beter is. Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Probeer weer wanneer jou mobiele dataverbinding beter is. Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Kan nie visuele stemboodskapdiens opdateer nie"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Kan nie visuele stemboodskapdiens opdateer nie"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Iets het verkeerd geloop"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontak asseblief Kliëntediens by <xliff:g id="NUMBER">%1$s</xliff:g> en gee vir hulle die foutkode 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visuele stemboodskapdiens se bepalings en voorwaardes"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Jy moet Verizon Wireless se bepalings en voorwaardes aanvaar om visuele stemboodskapdiens te gebruik:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nJy moet Verizon Wireless se bepalings en voorwaardes aanvaar om visuele stemboodskappe te gebruik:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Skakel visuele stemboodskappe aan"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuele stemboodskapdiens sal gedeaktiveer word as die bepalings en voorwaardes afgekeur word."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Deaktiveer visuele stemboodskapdiens"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Stemboodskaptranskripsie sal gedeaktiveer word as die bepalings en voorwaardes afgekeur word."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Deaktiveer stemboodskaptranskripsie"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Stempos sal slegs toeganklik wees as jy *86 bel. Stel \'n nuwe stempos-PIN om voort te gaan."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Stel PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml
index 502b873..14482e9 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"እይታዊ የድምጽ መልዕክት በማግበር ላይ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"እይታዊ የድምጽ መልዕክት ሙሉ ለሙሉ እስከሚነቃ ድረስ የድምፅ መልዕክት ማሳወቂያዎችን ላይቀበሉ ይችላሉ። የድምጽ መልዕክት ሙሉ ለሙሉ እስኪያገብር ድረስ አዲስ መልዕክቶችን ለማምጣት ወደ ድምፅ መልዕክት ይደውሉ።"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"እይታዊ የድምጽ መልዕክትን ማግበር አይቻልም"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ስልክዎ የሴሉላር ግንኙነት እንዳለው ያረጋግጡና እንደገና ይሞክሩ።"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ስልክዎ የተንቀሳቃሽ ስልክ አውታረ መረብ ግንኙነት እንዳለው ያረጋግጡና እንደገና ይሞክሩ።"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"የአውሮፕላን ሁነታን ያጥፉ እና እንደገና ይሞክሩ።"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ምንም ግንኙነት የለም"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ለአዲስ የድምጽ መልዕክቶች ማሳወቂያ አይደርስዎትም። Wi-Fi ላይ ከሆኑ አሁን በማስመር የድምጽ መልዕክትን መፈተሽ ይችላሉ።"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ለአዲስ የድምጽ መልዕክቶች ማሳወቂያ አይደርስዎትም። Wi-Fi ላይ ከሆኑ አሁን በማስመር የድምጽ መልዕክትን መፈተሽ ይችላሉ።"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ለአዲስ የድምጽ መልዕክቶች ማሳወቂያ አይደርስዎትም። የድምጽ መልዕክትዎን ለማስመር የአውሮፕላን ሁነታን ያጥፉ።"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"የድምጽ መልዕክት ለመፈተሽ ስልክዎ የሴሉላር ውሂብ ያስፈልገዋል።"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"የድምጽ መልዕክትን ለመፈተሽ ስልክዎ የተንቀሳቃሽ ስልክ ውሂብ ግንኙነት ያስፈልገዋል።"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"እይታዊ የድምጽ መልዕክትን ማግበር አይቻልም"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"አሁንም ቢሆን የድምጽ መልዕክትን ለመፈተሽ መደወል ይችላሉ።"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"የWi-Fi ወይም ሴሉላር ግንኙነትዎ ሲሻሻል እንደገና ይሞክሩ። አሁንም ቢሆን የድምጽ መልዕክት ለመፈተሽ መደወል ይችላሉ።"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"የሴሉላር ውሂብዎ ሲሻሻል እንደገና ይሞክሩ። አሁንም ቢሆን የድምጽ መልዕክትዎን ለመፈተሽ መደወል ይችላሉ።"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"የWi‑Fi ወይም የተንቀሳቃሽ ስልክ ውሂብ ግንኙነትዎ ሲሻሻል እንደገና ይሞክሩ። አሁንም ቢሆን የድምጽ መልዕክትዎን ለመፈተሽ መደወል ይችላሉ።"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"የተንቀሳቃሽ ስልክ ውሂብ ግንኙነትዎ ሲሻሻል እንደገና ይሞክሩ። አሁንም ቢሆን የድምጽ መልዕክትዎን ለመፈተሽ መደወል ይችላሉ።"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"አሁንም ቢሆን የድምጽ መልዕክትን ለመፈተሽ መደወል ይችላሉ።"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"የሆነ ችግር ተፈጥሯል"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"እባክዎ የደንበኛ አገልግሎትን በ<xliff:g id="NUMBER">%1$s</xliff:g> ላይ ያግኙ እና የስህተት ቁጥሩ 9999 እንደሆነ ይንገሯቸው።"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visual Voicemail የአገልግሎት ውል"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"እይታዊ የድምጽ መልዕክትን ለመጠቀም የVerizon Wirelessን የአገልግሎት ውል መቀበል አለብዎ፦ \n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nእይታዊ የድምጽ መልዕክትን ለመጠቀም የVerizon Wirelessን የአገልግሎት ውል መቀበል አለብዎ፦\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"እይታዊ የድምጽ መልዕክን አብራ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"የአገልግሎት ውሉ ተቀባይነት ካላገኘ እይታዊ የድምጽ መልዕክት ይወገዳል።"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"እይታዊ የድምጽ መልዕክትን አስወግድ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"የአገልግሎት ውል ተቀባይነት ካላገኙ፣ የድምጽ መልዕክት ወደ ጽሁፍ መለወጥ ይሰናከላል።"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"የድምጽ መልዕክትን ወደ ጽሁፍ መለወጥን አሰናክል"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"የድምጽ መልዕክት ላይ መድረስ የሚቻለው *86 በመደወል ብቻ ነው። ለመቀጠል አዲስ የድምጽ መልዕክት ፒን ያዘጋጁ።"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"ፒን ያዘጋጁ"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml
index 6d462ef..91f6398 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"تنشيط البريد الصوتي المرئي"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"قد لا تتلقّى إشعارات البريد الصوتي حتى يتم تنشيط البريد الصوتي المرئي تمامًا. يمكنك الاتصال بالبريد الصوتي لاسترداد الرسائل الجديدة إلى أن يتم تنشيط البريد الصوتي تمامًا."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"يتعذر تنشيط البريد الصوتي المرئي"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"تأكد من وجود اتصال جوال على هاتفك وحاول مرة أخرى."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"تأكد من أن هاتفك توجد به اتصال شبكة جوال وحاول مرة أخرى."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"أوقف تشغيل وضع الطائرة وحاول مرة أخرى."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"لا يتوفر اتصال"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"‏لن يتم إعلامك برسائل البريد الصوتي الجديدة. إذا كنت تستخدم شبكة Wi-Fi، فيمكنك التحقق من البريد الصوتي عن طريق إجراء المزامنة الآن."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"‏لن يتم إعلامك برسائل البريد الصوتي الجديدة. إذا كنت تستخدم شبكة Wi-Fi، فيمكنك التحقق من البريد الصوتي عن طريق إجراء المزامنة الآن."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"لن يتم إعلامك برسائل البريد الصوتي الجديدة. أوقف تشغيل وضع الطائرة لمزامنة بريدك الصوتي."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"يحتاج هاتفك إلى اتصال جوال للتحقق من البريد الصوتي."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"يحتاج هاتفك إلى اتصال بيانات جوال للتحقق من البريد الصوتي."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"يتعذر تنشيط البريد الصوتي المرئي"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"لا يزال بإمكانك إجراء الاتصال للتحقق من البريد الصوتي."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"يتعذر تحديث البريد الصوتي المرئي"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"‏حاول مرة أخرى عندما يكون لديك اتصال Wi-Fi أو جوال أفضل. لا يزال بإمكانك الاتصال والتحقق من البريد الصوتي."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"حاول مرة أخرى عندما يكون لديك اتصال جوال أفضل. لا يزال بإمكانك الاتصال والتحقق من البريد الصوتي."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"‏حاول مرة أخرى عندما يكون لديك اتصال Wi-Fi أو جوال أفضل. لا يزال بإمكانك الاتصال والتحقق من البريد الصوتي."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"حاول مرة أخرى عندما يكون لديك اتصال جوال أفضل. لا يزال بإمكانك الاتصال والتحقق من البريد الصوتي."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"يتعذر تحديث البريد الصوتي المرئي"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"لا يزال بإمكانك إجراء الاتصال للتحقق من البريد الصوتي."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"يتعذر تحديث البريد الصوتي المرئي"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"حدث خطأٌ ما"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"يُرجى الاتصال بخدمة العملاء على الرقم <xliff:g id="NUMBER">%1$s</xliff:g> وإبلاغهم أن رمز الخطأ هو 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"البنود والشروط للبريد الصوتي المرئي"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"‏يجب قبول البنود والشروط لاتصال Verizon اللاسلكي من أجل استخدام البريد الصوتي المرئي:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"‏%1$s\n\nينبغي لك قبول البنود والشروط التي تخص Verizon Wireless لاستخدام البريد الصوتي المرئي:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"تشغيل البريد الصوتي المرئي"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"سيتم تعطيل البريد الصوتي المرئي في حالة رفض البنود والشروط."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"تعطيل البريد الصوتي المرئي"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"سيتم تعطيل نسخ البريد الصوتي في حالة رفض البنود والشروط."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"تعطيل نسخ البريد الصوتي"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"يمكن الوصول إلى البريد الصوتي فقط عن طريق طلب *86. ينبغي تعيين رقم تعريف شخصي جديد للبريد الصوتي للمتابعة."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"تعيين رقم التعريف الشخصي"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml
index 33ddafa..5847984 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Vizual Səsli Mesaj aktiv edilir"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Vizual səsli mesaj tam aktiv edilənə klim səsli mesaj bildirişi ala bilməzsiniz. Səsli mesaj tam aktiv edilənə kimi yeni mesajları əldə etmək üçün səsli poçta zəng edin."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizual Səsli Mesaj aktiv edilə bilmir"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Telefonunuzda mobil bağlantı olduğuna əmin olun və yenidən cəhd edin."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Əmin olun ki, telefonun şəbəkə bağlantısı var və yenidən cəhd edin."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Təyyarə rejimini deaktiv edin və yenidən cəhd edin."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Bağlantı yoxdur"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Yeni gələn səsli mesajlara görə bildiriş almayacaqsınız. Wi-Fi qoşuludursa, sinxronizasiya etməklə səsli mesajları yoxlaya bilərsiniz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Yeni gələn səsli e-məktublara görə bildiriş almayacaqsınız. Wi-Fi qoşuludursa, sinxronizasiya etməklə səsli e-məktubları yoxlaya bilərsiniz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Yeni gələn səsli mesajlara görə bildiriş almayacaqsınız. Səsli mesajları sinxronizasiya etmək üçün təyyarə rejimini deaktiv edin."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Səsli mesajları yoxlamaq üçün telefonda mobil data bağlantısı olmalıdır."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Səsli e-məktubları yoxlamaq üçün telefonda mobil data bağlantısı olmalıdır."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizual Səsli Mesaj aktiv edilə bilmir"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Səsli mesajları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizual səsli mesajları yeniləmək olmur"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fivə ya mobil data bağlantısı yaxşı olduqda bir daha yoxlayın. Səsli mesajları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Mobil data bağlantısı yaxşı olduqda bir daha yoxlayın. Səsli mesajları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Wi‑Fi və ya mobil data bağlantısı daha yaxşı olduqda yenidən cəhd edin. Səsli e-məktubları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Mobil data bağlantısı yaxşı olduqda bir daha yoxlayın. Səsli e-məktubları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizual səsli mesajları yeniləmək olmur"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Səsli mesajları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizual səsli mesajları yeniləmək olmur"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Nəsə Xəta Oldu"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Lütfən, <xliff:g id="NUMBER">%1$s</xliff:g> nömrəsi ilə Müştəri Xidmətinə zəng edin. Xəta kodu 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vizual Səsli Poçt Şərtləri və Qaydaları"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Vizual səsli poçtu istifadə etmək üçün Verizon Wireless şərtlər və qaydalarını qəbul etməlisiniz:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nGörünən səsli e-poçtdan istifadə etmək üçün Verizon Wireless\'in şərt və qaydalarını qəbul etməlisiniz:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Görünən Səsli e-poçtu aktiv edin"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Şərtlər və qaydalar rədd edilsə, vizual səsli poçt deaktiv ediləcək."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Vizual səsli poçtu deaktiv edin"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Şərt və qaydalar rədd edilərsə, səsli e-poçt transkripsiyası deaktiv ediləcək."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Səsli e-poçt transkripsiyasını deaktiv edin"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Səsli məktub yalnız *86 nömrəsinə zəng etməklə mümkündür. Davam etmək üçün yeni səsli məktub PIN kodu təyin edin."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN kodu ayarlayın"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-b+sr+Latn/strings.xml
index 98dc061..dc9c23a 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-b+sr+Latn/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktivira se vizuelna govorna pošta"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Možda nećete dobijati obaveštenja o govornoj pošti dok potpuno ne aktivirate vizuelnu govornu poštu. Pozovite govornu poštu da biste preuzeli nove poruke dok govorna pošta ne bude potpuno aktivirana."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Aktiviranje vizuelne govorne pošte nije uspelo"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Proverite da li telefon ima mobilnu vezu i pokušajte ponovo."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Proverite da li telefon ima vezu preko mobilne mreže i probajte ponovo."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Isključite režim rada u avionu i pokušajte ponovo."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Veza nije uspostavljena"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nećete dobijati obaveštenja o novim govornim porukama. Ako ste na Wi-Fi mreži, sinhronizujte da biste proverili govornu poštu."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nećete dobijati obaveštenja o novim govornim porukama. Ako ste na Wi‑Fi mreži, možete da sinhronizujete da biste proverili govornu poštu."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nećete dobijati obaveštenja o novim govornim porukama. Isključite režim rada u avionu da biste sinhronizovali govornu poštu."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefonu treba mobilna veza za prenos podataka da biste proverili govornu poštu."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefonu je za proveru govorne pošte potrebna mobilna veza za prenos podataka."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Aktiviranje vizuelne govorne pošte nije uspelo"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"I dalje možete da pozovete govornu poštu da biste je proverili."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Ažuriranje vizuelne govorne pošte nije uspelo"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Probajte ponovo kad budete imali bolju Wi-Fi ili mobilnu vezu. I dalje možete da pozovete govornu poštu da biste je proverili."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Probajte ponovo kad budete imali bolju mobilnu vezu za prenos podataka. I dalje možete da pozovete govornu poštu da biste je proverili."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Probajte ponovo kad budete imali bolju Wi‑Fi ili mobilnu vezu za prenos podataka. I dalje možete da pozovete govornu poštu da biste je proverili."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Probajte ponovo kad budete imali bolju mobilnu vezu za prenos podataka. I dalje možete da pozovete govornu poštu da biste je proverili."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Ažuriranje vizuelne govorne pošte nije uspelo"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"I dalje možete da pozovete govornu poštu da biste je proverili."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Ažuriranje vizuelne govorne pošte nije uspelo"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Nešto nije u redu"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontaktirajte korisničku podršku na <xliff:g id="NUMBER">%1$s</xliff:g> i recite im da je kôd greške 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Uslovi i odredbe za vizuelnu govornu poštu"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Morate da prihvatite Verizon Wireless uslove i odredbe da biste koristili vizuelnu govornu poštu:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nMorate da prihvatite Verizon Wireless uslove i odredbe da biste koristili vizuelnu govornu poštu:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Uključite vizuelnu govornu poštu"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ako odbijete uslove i odredbe, onemogućićete vizuelnu govornu poštu."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Onemogućite vizuelnu govornu poštu"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripcija govorne pošte će biti onemogućena ako se uslovi i odredbe odbiju."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Onemogućite transkripciju govorne pošte"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Govornoj pošti ćete moći da pristupite samo ako pozovete *86. Podesite novi PIN kôd govorne pošte da biste nastavili."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Podesite PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml
index 50f32af..368a41f 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Актывацыя візуальнай галасавой пошты"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Вы можаце не атрымліваць апавяшчэнні галасавой пошты, пакуль візуальная галасавая пошта не будзе поўнасцю актывавана. Каб атрымліваць новыя паведамленні да завяршэння актывацыі, выклікайце галасавую пошту."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Немагчыма актываваць візуальную галасавую пошту"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Пераканайцеся, што ваш тэлефон падключаны да сотавай сеткі і паўтарыце спробу."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Пераканайцеся, што ваш тэлефон падключаны да мабільнай сеткі і паўтарыце спробу."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Выключыце рэжым палёту і паўтарыце спробу."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Няма падключэння"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Вас не будуць апавяшчаць аб новых галасавых паведамленнях. Калі вы падключаны да Wi-Fi, можаце праверыць галасавую пошту шляхам сінхранізацыі."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Вас не будуць апавяшчаць аб новых галасавых паведамленнях. Калі вы падключаны да Wi-Fi, можаце праверыць галасавую пошту шляхам сінхранізацыі."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Вас не будуць апавяшчаць аб новых галасавых паведамленнях. Выключыце рэжым палёту і сінхранізуйце сваю галасавую пошту."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Каб праверыць галасавую пошту, вашаму тэлефону патрэбна падключэнне да сотавай перадачы даных."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Каб праверыць галасавую пошту, вашаму тэлефону патрэбна падключэнне да мабільнай перадачы даных."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Немагчыма актываваць візуальную галасавую пошту"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Немагчыма абнавіць візуальную галасавую пошту"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Паўтарыце спробу, калі падключэнне да Wi-Fi да сотавай перадачы даных палепшыцца. Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Паўтарыце спробу, калі паша падключэнне да сотавай перадачы даных палепшыцца. Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Паўтарыце спробу, калі падключэнне да Wi-Fi або да мабільнай перадачы даных палепшыцца. Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Паўтарыце спробу, калі паша падключэнне да мабільнай перадачы даных палепшыцца. Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Немагчыма абнавіць візуальную галасавую пошту"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Немагчыма абнавіць візуальную галасавую пошту"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Нешта пайшло не так"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Звяжыцеся са Службай падтрымкі па нумары <xliff:g id="NUMBER">%1$s</xliff:g> і паведаміце код памылкі 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Умовы візуальнай галасавой пошты"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Вы павінны прыняць ўмовы Verizon Wireless, каб можна было карыстацца візуальнай галасавой поштай:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nВы павінны прыняць правілы і ўмовы Verizon Wireless, каб можна было карыстацца візуальнай галасавой поштай:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Уключыць візуальную галасавую пошту"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Без згоды з правіламі і ўмовамі візуальная галасавая пошта будзе адключана."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Адключыць візуальную галасавую пошту"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Без згоды з правіламі і ўмовамі транскрыпцыя галасавой пошты будзе адключана."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Адключыць транскрыпцыю галасавой пошты"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Галасавая пошта даступна толькі па выкліку на нумар *86. Каб працягнуць, задайце новы PIN-код галасавой пошты."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Задаць PIN-код"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml
index dbca19e..6e3463f 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Визуалната гласова поща се активира"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Възможно е да не получавате известия за гласова поща, докато визуалната гласова поща не бъде напълно активирана. Обаждайте се на номера за гласова поща, за да получавате нови съобщения, докато гласовата поща не е активирана."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Визуалната гласова поща не може да се активира"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Проверете дали телефонът ви има мобилна връзка и опитайте отново."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Проверете дали телефонът ви има връзка с мобилната мрежа и опитайте отново."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Изключете самолетния режим и опитайте отново."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Няма връзка"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Няма да бъдете известявани за нови гласови съобщения. Ако използвате Wi-Fi, можете да проверите за гласова поща, като синхронизирате сега."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Няма да бъдете известявани за нови гласови съобщения. Ако използвате Wi-Fi, можете да проверите за гласова поща, като синхронизирате сега."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Няма да бъдете известявани за нови гласови съобщения. Изключете самолетния режим, за да синхронизирате гласовата си поща."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"За да проверите гласовата поща, телефонът ви трябва да използва връзка за мобилни данни."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"За да проверите гласовата поща, телефонът ви трябва да използва мобилна връзка за данни."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Визуалната гласова поща не може да се активира"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Все пак можете да проверите гласовата поща с обаждане."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Визуалната гласова поща не може да се актуализира."</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Опитайте отново, когато имате по-добра Wi-Fi или мобилна връзка. Все пак можете да проверите гласовата поща с обаждане."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Опитайте отново, когато имате по-добра връзка за мобилни данни. Все пак можете да проверите гласовата поща с обаждане."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Опитайте отново, когато имате по-добра Wi-Fi връзка или мобилна връзка за данни. Пак можете да проверите гласовата си поща чрез обаждане."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Опитайте отново, когато имате по-добра мобилна връзка за данни. Пак можете да проверите гласовата си поща чрез обаждане."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Визуалната гласова поща не може да се актуализира."</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Все пак можете да проверите гласовата поща с обаждане."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Визуалната гласова поща не може да се актуализира."</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Нещо се обърка"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Моля, свържете се с екипа за поддръжка на клиенти на телефон <xliff:g id="NUMBER">%1$s</xliff:g> и кажете, че кодът на грешката е 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Общи условия за визуалната гласова поща"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"За да използвате визуалната гласова поща, трябва да приемете Общите условия на Verizon:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nЗа да използвате визуалната гласова поща, трябва да приемете Общите условия на Verizon:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Включване на визуалната гласова поща"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ако отхвърлите Общите условия, визуалната гласова поща ще бъде деактивирана."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Деактивиране на визуалната гласова поща"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ако отхвърлите Общите условия, създаването на преписи на гласовите съобщения ще бъде деактивирано."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Деактивиране на преписите на гласовите съобщения"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Ще имате достъп до гласовата поща само когато наберете *86. За да продължите, задайте нов ПИН за гласовата поща."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Задаване на ПИН"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml
index 5954448..867ca85 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ভিজ্যুয়াল ভয়েসমেল সক্রিয়করণ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ভিজ্যুয়াল ভয়েসমেল সম্পূর্ণরূপে সক্রিয় না করা পর্যন্ত আপনি ভয়েসমেল সংক্রান্ত কোনো বিজ্ঞপ্তি নাও পেতে পারেন৷ ভয়েসমেল সম্পূর্ণরূপে সক্রিয় না হওয়া পর্যন্ত নতুন বার্তাগুলিকে পুনরুদ্ধার করতে ভয়েসমেলে কল করুন৷"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ভিজ্যুয়াল ভয়েসমেল সক্রিয় করবেন না"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"নিশ্চিত করুন যে আপনার ফোনে সেলুলার সংযোগ আছে এবং আবার চেষ্টা করুন।"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"আপনার ফোনে কোনো মোবাইল নেটওয়ার্ক সংযোগ আছে কিনা নিশ্চিত করে আবার চেষ্টা করুন।"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"বিমান মোড বন্ধ করুন এবং আবার চেষ্টা করুন।"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"কোনো সংযোগ নেই"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"আপনাকে নতুন ভয়েসমেলগুলির জন্য সূচিত করা হবে না। আপনি Wi-Fi ব্যবহার করলে, আপনি এখনই সিঙ্ক করে ভয়েসমেল চেক করতে পারেন।"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"আপনাকে নতুন ভয়েসমেলগুলির জন্য সূচিত করা হবে না। আপনি ওয়াই-ফাই ব্যবহার করলে, এখনই সিঙ্ক করে ভয়েসমেল চেক করতে পারেন।"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"আপনাকে নতুন ভয়েসমেলগুলির জন্য সূচিত করা হবে না। আপনার ভয়েসমেলে সিঙ্ক করার জন্য বিমান মোড বন্ধ করুন।"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ভয়েসমেল চেক করার জন্য আপনার ফোনের একটি সেলুলার ডেটার প্রয়োজন।"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ভয়েসমেল চেক করার জন্য আপনার ফোনের একটি মোবাইল ডেটা সংযোগের প্রয়োজন।"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ভিজ্যুয়াল ভয়েসমেল সক্রিয় করবেন না"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ভিজ্যুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"যখন আপনার Wi-Fi অথবা সেলুলার সংযোগ ভালো থাকবে তখন আবার চেষ্টা করুন। আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"যখন আপনার Wi-Fi অথবা সেলুলার সংযোগ ভালো থাকবে তখন আবার চেষ্টা করুন। আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"যখন আপনার ওয়াই-ফাই অথবা মোবাইল ডেটা সংযোগ ভালো থাকবে তখন আবার চেষ্টা করুন। আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"মোবাইল ডেটা সংযোগ ভালো থাকবে তখন আবার চেষ্টা করুন। আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ভিজ্যুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ভিজ্যুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"কিছু ভুল হয়েছে"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"অনুগ্রহ করে <xliff:g id="NUMBER">%1$s</xliff:g> এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের জানান যে ত্রুটি কোডটি হলো ৯৯৯৯৷"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ভিজ্যুয়াল ভয়েসমেলের নিবন্ধন এবং শর্তাদি"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ভিজ্যুয়াল ভয়েসমেল ব্যবহার করার জন্য আপনাকে অবশ্যই Verizon Wireless এর নিবন্ধন এবং শর্তাদি স্বীকার করতে হবে:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nভিজ্যুয়াল ভয়েসমেল ব্যবহার করার জন্য আপনাকে অবশ্যই Verizon Wireless এর নিবন্ধন এবং শর্তাদি স্বীকার করতে হবে:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ভিজ্যুয়াল ভয়েসমেল চালু করুন"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"নিবন্ধন এবং শর্তাদি অস্বীকার করা হলে ভিজ্যুয়াল ভয়েসমেল অক্ষম করা হবে৷"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ভিজ্যুয়াল ভয়েসমেল অক্ষম করুন"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"নিবন্ধন এবং শর্তাদি অস্বীকার করা হলে ভিজ্যুয়াল ভয়েসমেলের ট্রান্সক্রিপশান অক্ষম করা হবে৷"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ভয়েসমেলের ট্রান্সক্রিপশান অক্ষম করুন"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"শুধুমাত্র *৮৬ নম্বরে কল করেই ভয়েসমেল অ্যাক্সেস করা যাবে৷ এগিয়ে যাওয়ার জন্য একটি নতুন ভয়েসমেলের পিন সেট করুন৷"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"পিন সেট করুন"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml
index 0352436..b22c752 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiviranje vizuelne govorne pošte"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Možda nećete primati obavještenja o govornoj pošti dok se vizuelna govorna pošta ne aktivira u potpunosti. U međuvremenu pozovite govornu poštu za preuzimanje novih poruka."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nije moguće aktivirati vizuelnu govornu poštu"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Provjerite imate li mobilnu mrežu na telefonu i pokušajte ponovo."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Provjerite imate li mobilnu mrežu na telefonu i pokušajte ponovo."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Isključite način rada u avionu i pokušajte ponovo."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Niste povezani na mrežu"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nećete primati obavještenja o novoj govornoj pošti. Ako ste na Wi-Fi mreži, možete provjeriti govornu poštu tako što ćete sada obaviti sinhronizaciju."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nećete primati obavještenja o novim govornim porukama. Ako ste na Wi-Fi mreži, provjerite govornu poštu tako što ćete odmah obaviti sinhronizaciju."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nećete primati obavještenja o novoj govornoj pošti. Isključite način rada u avionu da sinhronizirate govornu poštu."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Vaš telefon treba imati mobilnu podatkovnu vezu za provjeru govorne pošte."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefonu je potreban mobilni prijenos podataka radi provjere govorne pošte."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nije moguće aktivirati vizuelnu govornu poštu"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"I dalje možete nazvati za provjeru govorne pošte."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nije moguće ažurirati vizuelnu govornu poštu"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Pokušajte ponovo kada Wi-Fi ili mobilna mreža bude bolja. I dalje možete nazvati za provjeru govorne pošte."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Pokušajte ponovo kada mobilna podatkovna mreža bude bolja. I dalje možete nazvati za provjeru govorne pošte."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Pokušajte ponovo kada Wi-Fi veza ili mobilni prijenos podataka bude bolji. I dalje možete nazvati za provjeru govorne pošte."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Pokušajte ponovo kada mobilni prijenos podataka bude bolji. I dalje možete nazvati za provjeru govorne pošte."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nije moguće ažurirati vizuelnu govornu poštu"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"I dalje možete nazvati za provjeru govorne pošte."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nije moguće ažurirati vizuelnu govornu poštu"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Nešto nije uredu"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontaktirajte korisničku podršku na broj <xliff:g id="NUMBER">%1$s</xliff:g> i obavijestite ih da je kȏd greške 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Uslovi i odredbe vizuelne govorne pošte"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Morate prihvatiti uslove i odredbe kompanije Verizon Wireless prije korištenja vizuelne govorne pošte:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nMorate prihvatiti uslove i odredbe kompanije Verizon Wireless prije korištenja vizuelne govorne pošte:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Uključi vizuelnu govornu poštu"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Vizuelna govorna pošta bit će onemogućena ako odbijete uslove i odredbe."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Onemogući vizuelnu govornu poštu"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripcija govorne pošte će biti onemogućena ako odbijete uslove i odredbe."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Onemogući transkripciju govorne pošte"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Govornoj pošti ćete moći pristupiti samo pozivanjem broja *86. Postavite novi PIN govorne pošte da nastavite."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Postavi PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml
index b6d844d..4793f43 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"S\'està activant la bústia de veu visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"És possible que no rebis notificacions de missatges de veu fins que la bústia de veu visual estigui completament activada. Fins aleshores, truca a la bústia de veu per recuperar els missatges nous."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"No es pot activar la bústia de veu visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Comprova la connexió mòbil del telèfon i torna-ho a provar."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Assegura\'t que el telèfon tingui connexió a una xarxa mòbil i torna-ho a provar."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desactiva el mode d\'avió i torna-ho a provar."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sense connexió"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"No rebràs notificacions de missatges de veu nous. Si estàs connectat a una xarxa Wi-Fi, pots sincronitzar ara per consultar la bústia de veu."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"No rebràs notificacions de missatges de veu nous. Si estàs connectat a una xarxa Wi-Fi, pots sincronitzar ara per consultar la bústia de veu."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"No rebràs notificacions de missatges de veu nous. Desactiva el mode d\'avió per sincronitzar la bústia de veu."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"El telèfon necessita una connexió de dades mòbils per consultar la bústia de veu."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Cal que el telèfon tingui una connexió de dades mòbils per poder consultar la bústia de veu."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"No es pot activar la bústia de veu visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Pots trucar igualment per consultar la bústia de veu."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"No es pot actualitzar la bústia de veu visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Torna-ho a provar quan la connexió Wi-Fi o mòbil sigui millor. Pots trucar igualment per consultar la bústia de veu."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Torna-ho a provar quan la connexió de dades mòbils sigui millor. Pots trucar igualment per consultar la bústia de veu."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Torna-ho a provar quan la connexió Wi-Fi o de dades mòbils sigui millor. Pots trucar igualment per consultar la bústia de veu."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Torna-ho a provar quan la connexió de dades mòbils sigui millor. Pots trucar igualment per consultar la bústia de veu."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"No es pot actualitzar la bústia de veu visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Pots trucar igualment per consultar la bústia de veu."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"No es pot actualitzar la bústia de veu visual"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"S\'ha produït un error"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Contacta amb el servei d\'atenció al client al <xliff:g id="NUMBER">%1$s</xliff:g> i informa\'ls que el codi d\'error és 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termes i condicions de la bústia de veu visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Has d\'acceptar els termes i condicions de Verizon Wireless per utilitzar la bústia de veu visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nHas d\'acceptar els termes i condicions de Verizon Wireless per poder utilitzar la bústia de veu visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activa la bústia de veu visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"La bústia de veu visual es desactivarà si es rebutgen els termes i condicions."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desactiva la bústia de veu visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"La transcripció dels missatges de veu es desactivarà si es rebutgen els termes i condicions."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desactiva la transcripció dels missatges de veu"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Només podràs accedir a la bústia de veu trucant al *86. Defineix un nou PIN de la bústia de veu per continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Defineix el PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml
index c52f7b0..bf8f54c 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktivace vizuální hlasové schránky"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Je možné, že dokud nebude vizuální hlasová schránka plně aktivována, nebudou vám chodit oznámení z hlasové schránky. Do té doby se k novým zprávám dostanete po zavolání do hlasové schránky."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizuální hlasovou schránku se nepodařilo aktivovat"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Zkontrolujte, že je telefon připojen k mobilní síti a zkuste to znovu."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Zkontrolujte, že je telefon připojen k mobilní síti a zkuste to znovu."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Vypněte režim letadla a zkuste to znovu."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nejste připojeni"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nebudete dostávat oznámení o nových hlasových zprávách. Pokud jste připojeni k Wi-Fi, můžete hlasovou schránku zkontrolovat synchronizací."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nebudete dostávat oznámení o nových hlasových zprávách. Pokud jste připojeni k Wi-Fi, můžete hlasovou schránku zkontrolovat synchronizací."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nebudete dostávat oznámení o nových hlasových zprávách. Pokud chcete hlasovou schránku synchronizovat, vypněte režim letadla."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefon musí být připojen k mobilním datům, aby bylo možné zkontrolovat hlasovou schránku."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefon musí být připojen k mobilním datům, aby bylo možné zkontrolovat hlasovou schránku."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizuální hlasovou schránku se nepodařilo aktivovat"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Můžete ji ale stále zkontrolovat zavoláním."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizuální hlasovou schránku se nepodařilo aktualizovat"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Zkuste to znovu, až budete mít lepší připojení k Wi-Fi nebo k mobilním datům. Stále ale můžete hlasovou schránku zkontrolovat zavoláním."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Zkuste to znovu, až budete mít lepší připojení k mobilním datům. Stále ale můžete hlasovou schránku zkontrolovat zavoláním."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Zkuste to znovu, až budete mít lepší připojení k Wi-Fi nebo k mobilním datům. Stále ale můžete hlasovou schránku zkontrolovat zavoláním."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Zkuste to znovu, až budete mít lepší připojení k mobilním datům. Stále ale můžete hlasovou schránku zkontrolovat zavoláním."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizuální hlasovou schránku se nepodařilo aktualizovat"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Můžete ji ale stále zkontrolovat zavoláním."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizuální hlasovou schránku se nepodařilo aktualizovat"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Něco se pokazilo"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontaktujte zákaznický servis na čísle <xliff:g id="NUMBER">%1$s</xliff:g> a sdělte kód chyby 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Smluvní podmínky vizuální hlasové schránky"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Pokud chcete používat vizuální hlasovou schránku, musíte přijmout smluvní podmínky společnosti Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nChcete-li používat vizuální hlasovou schránku, musíte přijmout smluvní podmínky společnosti Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Zapnout vizuální hlasovou schránku"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Pokud smluvní podmínky odmítnete, vizuální hlasová schránka bude vypnuta."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Vypnout vizuální hlasovou schránku"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Pokud smluvní podmínky odmítnete, přepis hlasové schránky bude vypnut."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Vypnout přepis hlasové schránky"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Hlasová schránka bude dostupná jen zavoláním na číslo *86. Pokud chcete pokračovat, nastavte si nový kód PIN k hlasové schránce."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Nastavit kód PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml
index 26e5ede..71dc2e6 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiverer visuel telefonsvarer"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Du modtager muligvis ikke telefonsvarerunderretninger, før den visuelle telefonsvarer er fuldt aktiveret. Ring til telefonsvareren for hente nye beskeder, indtil telefonsvareren er fuldt aktiveret."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Visuel telefonsvarer kan ikke aktiveres"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Sørg for, at din telefon har mobilforbindelse, og prøv igen."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Sørg for, at din telefon har forbindelse til mobilnetværket, og prøv igen."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Slå flytilstand fra, og prøv igen."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ingen forbindelse"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Du vil ikke få besked om nye telefonsvarerbeskeder. Hvis du er på Wi-Fi, kan du tjekke, om der er telefonsvarerbeskeder, ved at synkronisere nu."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Du får ikke besked om nye talebeskeder. Hvis du er på Wi-Fi, kan du tjekke, om der er talebeskeder, ved at synkronisere nu."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Du vil ikke få besked om nye telefonsvarerbeskeder. Slå flytilstand fra for at synkronisere din e-mail."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Din telefon skal have en mobilforbindelse, for at du kan tjekke din telefonsvarer."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Din telefon skal have en mobildataforbindelse, for at du kan tjekke, om der er talebeskeder."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Visuel telefonsvarer kan ikke aktiveres"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Du kan stadig ringe op for at tjekke din telefonsvarer."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Visuel telefonsvarer kan ikke opdateres"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Prøv igen, når din Wi-Fi- eller mobilforbindelse er bedre. Du kan stadig ringe op for at tjekke din telefonsvarer."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Prøv igen, når din mobildataforbindelse er bedre. Du kan stadig ringe op for at tjekke din telefonsvarer."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Prøv igen, når din Wi-Fi- eller mobildataforbindelse er bedre. Du kan stadig ringe for at tjekke, om der er talebeskeder."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Prøv igen, når din mobildataforbindelse er bedre. Du kan stadig ringe for at tjekke, om der er talebeskeder."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Visuel telefonsvarer kan ikke opdateres"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Du kan stadig ringe op for at tjekke din telefonsvarer."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Visuel telefonsvarer kan ikke opdateres"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Der opstod en fejl"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontakt kundeservice på <xliff:g id="NUMBER">%1$s</xliff:g>, og fortæl dem, at fejlkoden er 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vilkår og betingelser for visuel telefonsvarer"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Du skal acceptere vilkår og betingelser for Verizon Wireless for at bruge visuel telefonsvarer:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDu skal acceptere vilkår og betingelser for Verizon Wireless for at bruge visuel telefonsvarer:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Slå Visuel telefonsvarer til"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuel telefonsvarer bliver deaktiveret, hvis vilkår og betingelser afvises."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Deaktiver visuel telefonsvarer"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transskription af talebeskeder deaktiveres, hvis du ikke accepterer vilkår og betingelser."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Deaktiver transskription af talebeskeder"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Telefonsvareren er kun tilgængelig, hvis du taster *86 og ringer op. Angiv en ny pinkode til telefonsvarer for at fortsætte."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Angiv pinkode"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml
index 865ddd9..c340582 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Visuelle Mailbox wird aktiviert"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Möglicherweise erhältst du keine Mailbox-Benachrichtigungen, solange die visuelle Mailbox nicht vollständig aktiviert ist. Bis es soweit ist, kannst du deine Mailbox anrufen, um neue Nachrichten abzuhören."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Visuelle Mailbox kann nicht aktiviert werden"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Vergewissere dich, dass dein Smartphone eine Mobilfunkverbindung hat und versuche es noch einmal."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Vergewissere dich, dass auf deinem Smartphone eine Mobilfunkverbindung besteht, und versuche es noch einmal."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Schalte den Flugmodus aus und versuche es noch einmal."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Keine Verbindung"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Du wirst nicht über neue Mailboxnachrichten informiert. Wenn du eine WLAN-Verbindung hast, kannst du deine Mailbox abrufen, indem du dein Smartphone jetzt synchronisierst."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Du wirst nicht über neue Mailboxnachrichten informiert. Wenn du eine WLAN-Verbindung verwendest, kannst du deine Mailbox abrufen, indem du dein Smartphone jetzt synchronisierst."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Du wirst nicht über neue Mailboxnachrichten informiert. Schalte den Flugmodus aus, um deine Mailbox zu synchronisieren."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Dein Smartphone benötigt eine mobile Datenverbindung, um die Mailbox abzurufen."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Dein Smartphone benötigt eine mobile Datenverbindung, um die Mailbox abzurufen."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Visuelle Mailbox kann nicht aktiviert werden"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Du kannst deine Mailbox immer noch per Anruf abhören."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Visuelle Mailbox kann nicht aktualisiert werden"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Versuch es noch einmal, sobald die WLAN- bzw. Mobilfunkverbindung besser ist. Du kannst deine Mailbox immer noch per Anruf abhören."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Versuch es noch einmal, sobald die Mobilfunkverbindung besser ist. Du kannst deine Mailbox immer noch per Anruf abhören."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Versuche es noch einmal, sobald die WLAN- bzw. Mobilfunkverbindung besser ist. Du kannst deine Mailbox weiterhin per Anruf abhören."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Versuche es noch einmal, sobald die Mobilfunkverbindung besser ist. Du kannst deine Mailbox weiterhin per Anruf abhören."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Visuelle Mailbox kann nicht aktualisiert werden"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Du kannst deine Mailbox immer noch per Anruf abhören."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Visuelle Mailbox kann nicht aktualisiert werden"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ein Problem ist aufgetreten"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Bitte wende dich an den Kundensupport unter der Nummer <xliff:g id="NUMBER">%1$s</xliff:g> und gib den Fehlercode 9999 an."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Nutzungsbedingungen für visuelle Mailbox"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Du muss den Nutzungsbedingungen von Verizon Wireless zustimmen, um die visuelle Mailbox zu verwenden:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDu musst den Nutzungsbedingungen von Verizon Wireless zustimmen, um die visuelle Mailbox zu verwenden:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Visuelle Mailbox aktivieren"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Die visuelle Mailbox wird deaktiviert, wenn du die Nutzungsbedingungen ablehnst."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Visuelle Mailbox deaktivieren"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Die Sprache-zu-Text-Umwandlung von Mailbox-Nachrichten wird deaktiviert, wenn die Nutzungsbedingungen abgelehnt werden."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Sprache-zu-Text-Umwandlung von Mailbox-Nachrichten deaktivieren"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Du kannst nur auf Mailboxnachrichten zugreifen, indem du *86 anrufst. Lege eine neue Mailbox-PIN fest, um fortzufahren."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN festlegen"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml
index acd1ca0..f05319d 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ενεργοποίηση οπτικού αυτόματου τηλεφωνητή"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Ενδέχεται να μην λαμβάνετε ειδοποιήσεις αυτόματου τηλεφωνητή έως ότου ο οπτικός αυτόματος τηλεφωνητής ενεργοποιηθεί πλήρως. Καλέστε τον αυτόματο τηλεφωνητή για να ανακτήσετε νέα μηνύματα, έως ότου γίνει πλήρης ενεργοποίηση του οπτικού αυτόματου τηλεφωνητή."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Δεν είναι δυνατή η ενεργοποίηση του οπτικού αυτόματου τηλεφωνητή"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Βεβαιωθείτε ότι το τηλέφωνό σας διαθέτει σύνδεση κινητής τηλεφωνίας και δοκιμάστε ξανά."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Βεβαιωθείτε ότι το τηλέφωνό σας διαθέτει σύνδεση κινητής τηλεφωνίας και δοκιμάστε ξανά."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Απενεργοποιήστε τη λειτουργία πτήσης και δοκιμάστε ξανά."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Δεν υπάρχει σύνδεση"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Δεν θα ειδοποιείστε για νέα φωνητικά μηνύματα. Εάν είστε συνδεδεμένοι μέσω Wi-Fi, μπορείτε να ελέγξετε τον αυτόματο τηλεφωνητή σας για μηνύματα, εκτελώντας συγχρονισμό τώρα."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Δεν θα ειδοποιείστε για νέα φωνητικά μηνύματα. Εάν είστε συνδεδεμένοι μέσω Wi-Fi, μπορείτε να ελέγξετε τον αυτόματο τηλεφωνητή σας για μηνύματα, εκτελώντας συγχρονισμό τώρα."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Δεν θα ειδοποιείστε για νέα φωνητικά μηνύματα. Απενεργοποιήστε τη λειτουργία πτήσης για συγχρονισμό φωνητικών μηνυμάτων του αυτόματου τηλεφωνητή σας."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Το τηλέφωνό σας χρειάζεται σύνδεση δεδομένων κινητής τηλεφωνίας για έλεγχο του αυτόματου τηλεφωνητή σας."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Το τηλέφωνό σας χρειάζεται σύνδεση δεδομένων κινητής τηλεφωνίας για έλεγχο του αυτόματου τηλεφωνητή σας."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Δεν είναι δυνατή η ενεργοποίηση του οπτικού αυτόματου τηλεφωνητή"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Μπορείτε και πάλι να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Δοκιμάστε ξανά όταν η σύνδεση Wi-Fi ή η σύνδεση κινητής τηλεφωνίας είναι καλύτερη. Ακόμα κι έτσι, μπορείτε να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Δοκιμάστε ξανά όταν η σύνδεση κινητής τηλεφωνίας είναι καλύτερη. Ακόμα κι έτσι, μπορείτε να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Δοκιμάστε ξανά όταν η σύνδεση Wi-Fi ή η σύνδεση κινητής τηλεφωνίας είναι καλύτερη. Ακόμα κι έτσι, μπορείτε να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Δοκιμάστε ξανά όταν η σύνδεση κινητής τηλεφωνίας είναι καλύτερη. Ακόμα κι έτσι, μπορείτε να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Μπορείτε και πάλι να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Παρουσιάστηκε κάποιο πρόβλημα"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο <xliff:g id="NUMBER">%1$s</xliff:g> και αναφέρετέ τους τον κωδικό σφάλματος 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Όροι και Προϋποθέσεις οπτικού αυτόματου τηλεφωνητή"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Πρέπει να αποδεχτείτε τους Όρους και τις Προϋποθέσεις της Verizon Wireless για να χρησιμοποιήσετε τον οπτικό αυτόματο τηλεφωνητή:\n\n"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nΠρέπει να αποδεχτείτε τους όρους και τις προϋποθέσεις της Verizon Wirelessγια τη χρήση οπτικού αυτόματου τηλεφωνητή:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ενεργοποίηση Οπτικού αυτόματου τηλεφωνητή"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ο οπτικός αυτόματος τηλεφωνητής θα απενεργοποιηθεί εάν δεν αποδεχτείτε τους Όρους και τις Προϋποθέσεις."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Απενεργοποίηση οπτικού αυτόματου τηλεφωνητή"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Η μεταγραφή αυτόματου τηλεφωνητή θα απενεργοποιηθεί εάν δεν αποδεχτείτε τους Όρους και τις Προϋποθέσεις."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Απενεργοποίηση μεταγραφής αυτόματου τηλεφωνητή"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Ο αυτόματος τηλεφωνητής θα είναι προσβάσιμος μόνο καλώντας το *86. Ορίστε έναν νέο αριθμό PIN αυτόματου τηλεφωνητή για να συνεχίσετε."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Ορισμός PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml
index a036950..2349fe0 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activating visual voicemail"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Can\'t activate visual voicemail"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Make sure that your phone has a mobile connection and try again."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Make sure your phone has a mobile network connection and try again."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Turn off aeroplane mode and try again."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"No connection"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"You won\'t be notified about new voicemail. If you\'re on Wi-Fi, you can check for voicemail by syncing now."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"You won\'t be notified for new voicemails. If you\'re on Wi‑Fi, you can check for voicemail by syncing now."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"You won\'t be notified about new voicemail. Turn off aeroplane mode to sync your voicemail."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Your phone needs a mobile data connection to check voicemail."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Your phone needs a mobile data connection to check voicemail."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Can\'t activate visual voicemail"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"You can still call to check voicemail."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Can\'t update visual voicemail"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Try again when your Wi-Fi or mobile connection is better. You can still call to check voicemail."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Try again when your Wi‑Fi or mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Can\'t update visual voicemail"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"You can still call to check voicemail."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Can\'t update visual voicemail"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Something went wrong"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Please contact Customer Service on <xliff:g id="NUMBER">%1$s</xliff:g> and tell them that the error code is 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visual voicemail Terms and Conditions"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"You must accept Verizon Wireless\'s Terms and Conditions to use visual voicemail:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nYou must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Turn on Visual Voicemail"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visual voicemail will be disabled if the Terms and Conditions are declined."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Disable visual voicemail"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Voicemail transcription will be disabled if the terms and conditions are declined."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Disable voicemail transcription"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Set PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml
index a036950..2349fe0 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activating visual voicemail"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Can\'t activate visual voicemail"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Make sure that your phone has a mobile connection and try again."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Make sure your phone has a mobile network connection and try again."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Turn off aeroplane mode and try again."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"No connection"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"You won\'t be notified about new voicemail. If you\'re on Wi-Fi, you can check for voicemail by syncing now."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"You won\'t be notified for new voicemails. If you\'re on Wi‑Fi, you can check for voicemail by syncing now."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"You won\'t be notified about new voicemail. Turn off aeroplane mode to sync your voicemail."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Your phone needs a mobile data connection to check voicemail."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Your phone needs a mobile data connection to check voicemail."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Can\'t activate visual voicemail"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"You can still call to check voicemail."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Can\'t update visual voicemail"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Try again when your Wi-Fi or mobile connection is better. You can still call to check voicemail."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Try again when your Wi‑Fi or mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Can\'t update visual voicemail"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"You can still call to check voicemail."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Can\'t update visual voicemail"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Something went wrong"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Please contact Customer Service on <xliff:g id="NUMBER">%1$s</xliff:g> and tell them that the error code is 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visual voicemail Terms and Conditions"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"You must accept Verizon Wireless\'s Terms and Conditions to use visual voicemail:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nYou must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Turn on Visual Voicemail"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visual voicemail will be disabled if the Terms and Conditions are declined."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Disable visual voicemail"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Voicemail transcription will be disabled if the terms and conditions are declined."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Disable voicemail transcription"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Set PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml
index a036950..2349fe0 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activating visual voicemail"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Can\'t activate visual voicemail"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Make sure that your phone has a mobile connection and try again."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Make sure your phone has a mobile network connection and try again."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Turn off aeroplane mode and try again."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"No connection"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"You won\'t be notified about new voicemail. If you\'re on Wi-Fi, you can check for voicemail by syncing now."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"You won\'t be notified for new voicemails. If you\'re on Wi‑Fi, you can check for voicemail by syncing now."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"You won\'t be notified about new voicemail. Turn off aeroplane mode to sync your voicemail."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Your phone needs a mobile data connection to check voicemail."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Your phone needs a mobile data connection to check voicemail."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Can\'t activate visual voicemail"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"You can still call to check voicemail."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Can\'t update visual voicemail"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Try again when your Wi-Fi or mobile connection is better. You can still call to check voicemail."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Try again when your Wi‑Fi or mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Can\'t update visual voicemail"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"You can still call to check voicemail."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Can\'t update visual voicemail"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Something went wrong"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Please contact Customer Service on <xliff:g id="NUMBER">%1$s</xliff:g> and tell them that the error code is 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visual voicemail Terms and Conditions"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"You must accept Verizon Wireless\'s Terms and Conditions to use visual voicemail:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nYou must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Turn on Visual Voicemail"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visual voicemail will be disabled if the Terms and Conditions are declined."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Disable visual voicemail"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Voicemail transcription will be disabled if the terms and conditions are declined."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Disable voicemail transcription"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Set PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml
index 485a78b..16a74d9 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activando el buzón de voz visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Es posible que no recibas notificaciones de los mensajes de voz hasta que el buzón de voz visual se encuentre completamente activado. Hasta ese momento, puedes llamar al buzón de voz para recuperar los mensajes nuevos."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"No se puede activar el buzón de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Asegúrate de que el teléfono tenga conexión móvil y vuelve a intentarlo."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Asegúrate de que el teléfono tenga conexión móvil y vuelve a intentarlo."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desactiva el modo de avión y vuelve a intentarlo."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sin conexión"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"No recibirás notificaciones de los mensajes de voz nuevos. Si estás conectado a Wi-Fi, puedes sincronizar ahora para revisar el buzón de voz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"No recibirás notificaciones de los mensajes de voz nuevos. Si estás conectado a Wi-Fi, puedes sincronizar ahora para revisar el buzón de voz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"No recibirás notificaciones de los mensajes de voz nuevos. Desactiva el modo de avión para sincronizar el buzón de voz."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"El teléfono necesita una conexión de datos móviles para revisar el buzón de voz."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"El teléfono necesita una conexión de datos móviles para revisar el buzón de voz."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"No se puede activar el buzón de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Aún puedes llamar para revisar el buzón de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"No se puede actualizar el buzón de voz visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Vuelve a intentarlo cuando la conexión Wi-Fi o la conexión móvil mejoren. Aún puedes llamar para revisar el buzón de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Vuelve a intentarlo cuando la conexión de datos móviles mejore. Aún puedes llamar para revisar el buzón de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Vuelve a intentarlo cuando la conexión Wi-Fi o la conexión de datos móviles mejoren. Aún puedes llamar para revisar el buzón de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Vuelve a intentarlo cuando la conexión de datos móviles mejore. Aún puedes llamar para revisar el buzón de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"No se puede actualizar el buzón de voz visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Aún puedes llamar para revisar el buzón de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"No se puede actualizar el buzón de voz visual"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Se produjo un error"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Comunícate con el servicio de atención al cliente al <xliff:g id="NUMBER">%1$s</xliff:g> e indícales que el código de error es el 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Términos y condiciones del buzón de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Debes aceptar los términos y condiciones de Verizon Wireless para usar el buzón de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDebes aceptar los términos y condiciones de Verizon Wireless para usar el buzón de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activar el buzón de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"El buzón de voz visual se desactiva si no aceptas los términos y condiciones."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Inhabilitar buzón de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"La transcripción del buzón de voz se desactivará si no aceptas los términos y condiciones."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Inhabilitar la transcripción del buzón de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Solo podrás acceder al buzón de voz llamando al *86. Para continuar, establece un nuevo PIN para el buzón de voz."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Establecer PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml
index d351f37..af0d583 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activando el buzón de voz visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Es posible que no recibas notificaciones de mensajes de voz hasta que se active totalmente el buzón de voz visual. Hasta ese momento, puedes llamar al buzón de voz para escuchar los mensajes nuevos."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"No se puede activar el correo de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Comprueba que el teléfono tenga cobertura e inténtalo otra vez."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Asegúrate de que tu teléfono tenga conexión a una red móvil y vuelve a intentarlo."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desactiva el modo avión e inténtalo otra vez."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sin conexión"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"No recibirás notificaciones de los mensajes de voz nuevos. Si estás usando una Wi-Fi, puedes sincronizar ahora el teléfono para comprobar si hay mensajes de voz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"No recibirás notificaciones de los mensajes de voz nuevos. Si estás usando una Wi-Fi, puedes sincronizar ahora el teléfono para comprobar si hay mensajes de voz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"No recibirás notificaciones de los mensajes de voz nuevos. Si quieres sincronizar tu buzón de voz, desactiva el modo avión."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Para comprobar el buzón de voz, necesitas una conexión de datos móviles en el teléfono."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Para comprobar el buzón de voz, necesitas una conexión de datos móviles en el teléfono."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"No se puede activar el correo de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Puedes llamar para comprobar el buzón de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"No se puede actualizar el correo de voz visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Inténtalo otra vez cuando tengas mejor conexión Wi-Fi o de datos móviles. Puedes llamar para comprobar el buzón de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Inténtalo otra vez cuando tengas mejor conexión de datos móviles. Puedes llamar para comprobar el buzón de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Inténtalo otra vez cuando tengas mejor conexión Wi-Fi o de datos móviles. Puedes llamar para comprobar el buzón de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Inténtalo otra vez cuando tengas mejor conexión de datos móviles. Puedes llamar para comprobar el buzón de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"No se puede actualizar el correo de voz visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Puedes llamar para comprobar el buzón de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"No se puede actualizar el correo de voz visual"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Se ha producido un error"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Llama al servicio de Atención al cliente al <xliff:g id="NUMBER">%1$s</xliff:g> e indícales que el código de error es el 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Términos y Condiciones del buzón de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Tienes que aceptar los términos y condiciones de Verizon Wireless para usar el buzón de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDebes aceptar los términos y condiciones de Verizon Wireless para poder usar el buzón de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activar el buzón de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Si rechazas los términos y condiciones, el buzón de voz visual se quedará inhabilitado."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Inhabilitar el buzón de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Si rechazas los términos y condiciones, se inhabilitará la transcripción de mensajes de voz."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Inhabilitar la transcripción de mensajes de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Solo podrás acceder al buzón de voz llamando al *86. Configura un nuevo PIN del buzón para continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Configurar el PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml
index 953b36b..bf27a14 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Visuaalse kõneposti aktiveerimine"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Te ei pruugi kõneposti märguandeid saada enne, kui visuaalne kõnepost on täielikult aktiveeritud. Kuni kõnepost on täielikult aktiveeritud, helistage uute sõnumite toomiseks kõneposti."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Visuaalset kõneposti ei saa aktiveerida"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Veenduge, et teie telefonis oleks mobiilne andmeside saadaval, ja proovige uuesti."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Veenduge, et teie telefonis oleks mobiilsidevõrk saadaval, ja proovige uuesti."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Lülitage lennurežiim välja ja proovige uuesti."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ühendus puudub"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Teid ei teavitata uutest kõnepostisõnumitest. Kui kasutate WiFi-t, saate kõneposti kontrollida, kui kohe sünkroonite."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Teid ei teavitata uutest kõnepostisõnumitest. Kui kasutate WiFi-t, saate kõneposti kontrollida, kui kohe sünkroonite."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Teid ei teavitata uutest kõnepostisõnumitest. Kõneposti sünkroonimiseks lülitage lennurežiim välja."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Teie telefonis peab kõneposti kontrollimiseks olema lubatud mobiilne andmeside."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Teie telefonis peab kõneposti kontrollimiseks olema lubatud mobiilne andmesideühendus."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Visuaalset kõneposti ei saa aktiveerida"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Visuaalset kõneposti ei saa värskendada"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Proovige uuesti, kui WiFi- või mobiilne andmesideühendus on parem. Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Proovige uuesti, kui mobiilne andmesideühendus on parem. Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Proovige uuesti, kui WiFi- või mobiilne andmesideühendus on parem. Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Proovige uuesti, kui mobiilne andmesideühendus on parem. Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Visuaalset kõneposti ei saa värskendada"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Visuaalset kõneposti ei saa värskendada"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Midagi läks valesti"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Võtke ühendust klienditeenindusega numbril <xliff:g id="NUMBER">%1$s</xliff:g> ja öelge neile, et veakood on 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visuaalse kõneposti nõuded ja tingimused"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Visuaalse kõneposti kasutamiseks peate nõustuma Verizon Wirelessi nõuete ja tingimustega:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVisuaalse kõneposti kasutamiseks peate nõustuma Verizon Wirelessi nõuete ja tingimustega:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Visuaalse kõneposti sisselülitamine"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuaalne kõnepost keelatakse, kui nõuded ja tingimused tagasi lükatakse."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Visuaalse kõneposti keelamine"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Kõnepostisõnumite transkribeerimine keelatakse, kui nõuete ja tingimustega ei nõustuta."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Kõnepostisõnumite transkribeerimise keelamine"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Kõnepost on saadaval vaid siis, kui helistate numbril *86. Jätkamiseks määrake uus kõneposti PIN-kood."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN-koodi määramine"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml
index af40192..86be1e8 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ikusizko erantzungailua aktibatzen"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"aktibatu arte, agian ez duzu jasoko erantzungailuaren jakinarazpenik. Erantzungailua guztiz aktibatuta ez dagoen artean, deitu erantzungailuari mezu berriak entzuteko."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Ezin da aktibatu ikusizko erantzungailua"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Ziurtatu telefonoak datu-konexioa duela eta saiatu berriro."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Ziurtatu telefonoak datu-konexioa duela eta saiatu berriro."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desaktibatu hegaldi modua eta saiatu berriro."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ez dago konexiorik"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Ez duzu jakinarazpenik jasoko ahots-mezu berriak dituzunean. Wi-Fi sarea erabiltzen ari bazara, orain sinkroniza dezakezu erantzungailua ahots-mezurik duzun begiratzeko."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Ez duzu jasoko jakinarazpenik ahots-mezu berriak dituzunean. Wi-Fi sarea erabiltzen ari bazara, orain sinkroniza dezakezu erantzungailua ahots-mezurik duzun begiratzeko."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Ez duzu jakinarazpenik jasoko ahots-mezu berriak dituzunean. Desaktibatu hegaldi modua erantzungailua sinkronizatzeko."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Erantzungailua egiaztatzeko, datu-konexioa behar du telefonoak."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Erantzungailua egiaztatzeko, datu-konexioa behar du telefonoak."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Ezin da aktibatu ikusizko erantzungailua"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Deitu egin dezakezu erantzungailua egiaztatzeko."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Ezin da eguneratu ikusizko erantzungailua."</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Saiatu berriro Wi-Fi konexioa edo datu-mugikorrak hobeak direnean. Deitu egin dezakezu erantzungailua egiaztatzeko."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Saiatu berriro datu-konexioa hobea denean. Deitu egin dezakezu erantzungailua egiaztatzeko."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Saiatu berriro Wi-Fi edo datu-konexioa hobeak direnean. Deitu egin dezakezu erantzungailua egiaztatzeko."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Saiatu berriro datu-konexioa hobea denean. Deitu egin dezakezu erantzungailua egiaztatzeko."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Ezin da eguneratu ikusizko erantzungailua."</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Deitu egin dezakezu erantzungailua egiaztatzeko."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Ezin da eguneratu ikusizko erantzungailua."</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Arazoren bat izan da"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Jarri harremanetan bezeroarentzako arreta-zerbitzuarekin (<xliff:g id="NUMBER">%1$s</xliff:g>) eta esan iezaiezu errore-kodea 9999 dela."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Ikusizko erantzungailuaren Zehaztapenak eta baldintzak"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Verizon Wireless zerbitzuaren zehaztapenak eta baldintzak onartu behar dituzu ikusizko erantzungailua erabiltzeko:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVerizon Wireless zerbitzuaren Zehaztapenak eta baldintzak onartu behar dituzu ikusizko erantzungailua erabiltzeko:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Aktibatu ikusizko erantzungailua"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Zehaztapenak eta baldintzak onartzen ez badituzu, desgaitu egingo da ikusizko erantzungailua."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desgaitu ikusizko erantzungailua"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Zehaztapenak eta baldintzak onartzen ez badituzu, desgaitu egingo da ahots-mezuak transkribatzeko aukera."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desgaitu ahots-mezuak transkribatzeko aukera"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Erantzungailua atzitzeko, *86 zenbakira deitu beharko duzu. Jarraitzeko, ezarri erantzungailuaren PIN kodea."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Ezarri PIN kodea"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml
index af79322..7b5b29b 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"فعال کردن پست صوتی تصویری"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ممکن است تا زمانی که پست صوتی تصویری کاملاً فعال نشده باشد، اعلان‌های پست صوتی را دریافت نکنید. تا زمانی که پست صوتی به‌طور کامل فعال نشده است، برای بازیابی پیام‌های جدید، با پست صوتی تماس بگیرید."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"پست صوتی تصویری فعال نشد"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"بررسی کنید تلفن دارای اتصال همراه باشد و دوباره امتحان کنید."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"مطمئن شوید تلفنتان اتصال شبکه تلفن همراه دارد و دوباره امتحان کنید."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"حالت هواپیما را غیرفعال کنید و دوباره امتحان کنید."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"اتصال برقرار نیست"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"‏برای پست‌های صوتی جدید به شما اطلاع داده نمی‌شود. اگر از Wi-Fi استفاده می‌کنید، اکنون با همگام‌سازی می‌توانید پست صوتی را بررسی کنید."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"‏از پست‌های صوتی جدید مطلع نمی‌شود. اگر از Wi-Fi استفاده می‌کنید، با انجام همگام‌سازی در این لحظه، می‌توانید پست صوتی را بررسی کنید."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"برای پست‌های صوتی جدید به شما اطلاع داده نمی‌شود. حالت هواپیما را غیرفعال کنید تا پست صوتی همگام‌سازی شود."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"تلفنتان برای بررسی پست صوتی به اتصال داده همراه نیاز دارد."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"برای بررسی پست صوتی، تلفنتان باید اتصال داده همراه داشته باشد."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"پست صوتی تصویری فعال نشد"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"پست صوتی تصویری به‌روزرسانی نشد"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"‏وقتی Wi-Fi یا اتصال همراه بهتر شد دوباره امتحان کنید. همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"وقتی اتصال داده همراه بهتر شد دوباره امتحان کنید. همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"‏وقتی Wi-Fi یا اتصال داده همراه بهتر شد دوباره امتحان کنید. همچنان می‌توانید برای بررسی پست صوتی، تماس بگیرید."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"وقتی اتصال داده همراه بهتر شد دوباره امتحان کنید. همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"پست صوتی تصویری به‌روزرسانی نشد"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"پست صوتی تصویری به‌روزرسانی نشد"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"مشکلی روی داد"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"لطفاً از طریق شماره <xliff:g id="NUMBER">%1$s</xliff:g> با خدمات مشتری تماس بگیرید و این کد خطا را به آنها بگویید: ٩٩٩٩."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"شرایط و ضوابط پست صوتی دیداری"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"‏برای استفاده از پست صوتی تصویری باید  شرایط و ضوابط Verizon Wireless را بپذیرید:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"‏%1$s\n\nبرای استفاده از پست صوتی تصویری، باید با شرایط و ضوابط Verizon Wireless موافقت کنید:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"روشن کردن پست صوتی تصویری"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"اگر شرایط و ضوابط را رد کنید، پست صوتی تصویری غیرفعال می‌شود."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"غیرفعال کردن پست صوتی تصویری"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"اگر شرایط و ضوابط را رد کنید، ترانویسی پست صوتی غیرفعال خواهد شد."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"غیرفعال کردن ترانویسی پست صوتی"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"پست صوتی فقط از طریق تماس با ٨۶* قابل دسترسی است. برای ادامه، یک پین پست صوتی جدید تنظیم کنید."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"تنظیم پین"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml
index 5416765..91ac263 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktivoidaan visuaalista puhelinvastaajaa."</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Et ehkä saa vastaajan ilmoituksia, ennen kuin visuaalinen puhelinvastaaja on täysin aktivoitu. Saat uudet viestit soittamalla vastaajaan."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Visuaalisen puhelinvastaajan aktivointi epäonnistui."</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Varmista, että puhelimesi mobiiliyhteys toimii, ja yritä uudelleen."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Varmista, että puhelimesi mobiilidatayhteys toimii, ja yritä uudelleen."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Poista lentokonetila käytöstä ja yritä uudelleen."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ei yhteyttä"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Uusista vastaajaviesteistä ei lähetetä ilmoitusta. Jos olet Wi-Fi:ssä, voit tarkistaa vastaajaviestit synkronoimalla nyt."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Uusista vastaajaviesteistä ei lähetetä ilmoitusta. Jos olet yhteydessä Wi-Fi-verkkoon, voit tarkistaa vastaajaviestit synkronoimalla nyt."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Uusista vastaajaviesteistä ei lähetetä ilmoitusta. Synkronoi vastaajaviestit poistamalla lentokonetila käytöstä."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Vastaajaviestien tarkistamista varten puhelimessasi on oltava mobiilidatayhteys."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Vastaajaviestien tarkistamista varten puhelimessasi on oltava mobiilidatayhteys."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Visuaalisen puhelinvastaajan aktivointi epäonnistui."</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Voit silti tarkistaa vastaajaviestit soittamalla."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Visuaalisen vastaajan päivitys epäonnistui."</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Yritä uudelleen, kun olet Wi-Fi:ssä tai mobiiliyhteys on parempi. Voit silti tarkistaa vastaajaviestit soittamalla."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Yritä uudelleen, kun mobiilidatayhteys on parempi. Voit silti tarkistaa vastaajaviestit soittamalla."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Yritä uudelleen, kun Wi-Fi- tai mobiilidatayhteys on vahvempi. Voit edelleen tarkistaa vastaajaviestit soittamalla."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Yritä uudelleen, kun mobiilidatayhteys on vahvempi. Voit edelleen tarkistaa vastaajaviestit soittamalla."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Visuaalisen vastaajan päivitys epäonnistui."</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Voit silti tarkistaa vastaajaviestit soittamalla."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Visuaalisen vastaajan päivitys epäonnistui."</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Jokin meni vikaan"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Ota yhteys asiakastukeen numerossa <xliff:g id="NUMBER">%1$s</xliff:g> ja ilmoita virhekoodi 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visuaalisen puhelinvastaajan käyttöehdot"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Visuaalisen puhelinvastaajan käyttöä varten sinun on hyväksyttävä Verizon Wirelessin käyttöehdot:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nSinun on hyväksyttävä Verizon Wirelessin käyttöehdot, jotta voit käyttää visuaalista puhelinvastaajaa:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ota visuaalinen puhelinvastaaja käyttöön"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuaalinen puhelinvastaaja poistetaan käytöstä, jos käyttöehtoja ei hyväksytä."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Poista visuaalinen puhelinvastaaja käytöstä"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Puhelinvastaajan transkriptio poistetaan käytöstä, jos käyttöehtoja ei hyväksytä."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Poista puhelinvastaajan transkriptio käytöstä"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Vastaaja on käytettävissä vain soittamalla numeroon *86. Jatka asettamalla vastaajalle uusi PIN-koodi."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Aseta PIN-koodi"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml
index ef88ecf..1713652 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activation de la messagerie vocale visuelle"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Vous ne recevrez peut-être aucune notification de la messagerie vocale tant que la messagerie vocale visuelle ne sera pas complètement activée. Appelez la messagerie vocale pour récupérer de nouveaux messages jusqu\'à l\'activation complète de la messagerie vocale."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Impossible d\'activer la messagerie vocale visuelle"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Assurez-vous que votre téléphone dispose d\'une connexion cellulaire et réessayez."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Assurez-vous que votre téléphone dispose d\'une connexion réseau cellulaire et réessayez."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Désactivez le mode Avion et réessayez."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Aucune connexion"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Vous ne serez pas averti à la réception de nouveaux messages vocaux. Si vous utilisez le Wi-Fi, vous pouvez vérifier si vous avez de nouveaux messages vocaux par une synchronisation."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Vous ne recevrez pas de notification à l\'arrivée de nouveaux messages vocaux. Si vous utilisez le Wi-Fi, vous pouvez vérifier si vous avez de nouveaux messages vocaux en effectuant une synchronisation."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Vous ne serez pas averti à la réception de nouveaux messages vocaux. Désactivez le mode Avion pour synchroniser votre messagerie vocale."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Votre téléphone requiert une connexion de données cellulaire pour consulter la messagerie vocale."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Votre téléphone requiert une connexion de données mobiles pour que vous puissiez consulter la messagerie vocale."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Impossible d\'activer la messagerie vocale visuelle"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Réessayez lorsque votre connexion Wi-Fi ou cellulaire sera meilleure. Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Réessayez lorsque votre connexion cellulaire sera meilleure. Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Réessayez lorsque votre connexion Wi-Fi ou de données mobiles sera meilleure. Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Réessayez lorsque votre connexion de données mobiles sera meilleure. Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Une erreur s\'est produite"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Veuillez communiquer avec le service à la clientèle au numéro <xliff:g id="NUMBER">%1$s</xliff:g> et lui indiquer que le code d\'erreur est le 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Conditions d\'utilisation de la messagerie vocale visuelle"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Vous devez accepter les conditions d\'utilisation de Verizon Wireless pour utiliser la messagerie vocale visuelle : \n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVous devez accepter les conditions d\'utilisation de Verizon Wireless pour utiliser la messagerie vocale visuelle :\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activer la messagerie vocale visuelle"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Si les conditions d\'utilisation sont refusées, la messagerie vocale visuelle sera désactivée."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Désactiver la messagerie vocale visuelle"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Si les conditions d\'utilisation sont refusées, la fonction de transcription des messages vocaux sera désactivée."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Désactiver la fonction de transcription des messages vocaux"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Pour accéder à la messagerie vocale, vous devrez composer *86. Définissez un nouveau NIP de messagerie vocale pour continuer."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Définir le NIP"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml
index eefd5ad..a75cd12 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activation de la messagerie vocale visuelle..."</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Tant que la messagerie vocale visuelle n\'est pas totalement activée, vous risquez de ne pas être averti de la réception de nouveaux messages. Appelez votre boîte vocale pour consulter ces derniers."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Impossible d\'activer la messagerie vocale visuelle"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Vérifiez que votre téléphone est bien connecté au réseau mobile, puis réessayez."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Vérifiez que votre téléphone est bien connecté au réseau mobile, puis réessayez."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Désactivez le mode Avion, puis réessayez."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Aucune connexion"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Vous ne recevrez aucune notification en cas de nouveau message vocal. Si vous êtes connecté en Wi-Fi, vous pouvez consulter votre messagerie vocale maintenant en effectuant une synchronisation."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Vous ne recevrez aucune notification en cas de nouveau message vocal. Si vous êtes connecté en Wi-Fi, vous pouvez consulter votre messagerie vocale dès à présent en effectuant une synchronisation."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Vous ne recevrez aucune notification en cas de nouveau message. Désactivez le mode Avion pour synchroniser votre messagerie vocale."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Vous devez disposer d\'une connexion de données mobiles pour consulter votre messagerie vocale."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Vous devez disposer d\'une connexion de données mobiles pour consulter votre messagerie vocale."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Impossible d\'activer la messagerie vocale visuelle"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"La consultation de votre messagerie vocale par téléphone est toujours possible."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Réessayez lorsque vous bénéficierez d\'une meilleure connexion au réseau mobile ou Wi-Fi. La consultation de votre messagerie vocale par téléphone est toujours possible."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Réessayez lorsque vous bénéficierez d\'une meilleure connexion de données mobiles. La consultation de votre messagerie vocale par téléphone est toujours possible."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Réessayez lorsque vous bénéficierez d\'une meilleure connexion au réseau mobile ou Wi-Fi. Vous pouvez tout de même consulter votre messagerie vocale par téléphone."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Réessayez lorsque vous bénéficierez d\'une meilleure connexion de données mobiles. Vous pouvez tout de même consulter votre messagerie vocale par téléphone."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"La consultation de votre messagerie vocale par téléphone est toujours possible."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Problème"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Veuillez contacter le service client au <xliff:g id="NUMBER">%1$s</xliff:g>. Le code d\'erreur à transmettre au conseiller est le 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Conditions d\'utilisation de la messagerie vocale visuelle"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Vous devez accepter les conditions d\'utilisation de Verizon Wireless pour pouvoir utiliser la messagerie vocale visuelle :\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVous devez accepter les conditions d\'utilisation de Verizon Wireless pour pouvoir utiliser la messagerie vocale virtuelle :\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activer la messagerie vocale visuelle"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Si vous refusez les conditions d\'utilisation, la messagerie vocale visuelle sera désactivée."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Désactiver la messagerie vocale visuelle"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"La transcription des messages vocaux sera désactivée en cas de refus des conditions d\'utilisation."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Désactiver la transcription des messages vocaux"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Vous ne pouvez accéder à la messagerie vocale qu\'en composant le *86. Définissez un nouveau code PIN de messagerie vocale pour continuer."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Définir un code"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml
index efd174f..4cdd5dd 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activando correo de voz visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"É posible que non recibas notificacións do correo de voz ata que actives o correo de voz visual. Chama ao correo de voz para consultar as mensaxes novas ata que o correo de voz estea completamente activado."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Non se pode activar o correo de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Asegúrate de que o teléfono ten conexión móbil e téntao de novo."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Asegúrate de que o teu teléfono ten unha conexión de rede móbil e téntao de novo."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desactiva o modo avión e téntao de novo."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sen conexión"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Non recibirás notificacións dos correos de voz novos. Se estás utilizando o sinal wifi, podes comprobar o correo de voz se o sincronizas agora."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Non recibirás notificacións dos correos de voz novos. Se estás utilizando o sinal wifi, podes comprobar o correo de voz se o sincronizas agora."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Non recibirás notificacións dos correos de voz novos. Desactiva o modo avión para sincronizar o correo de voz."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"O teléfono necesita conexión de datos móbiles para comprobar o correo de voz."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"O teléfono necesita conexión de datos móbiles para comprobar o correo de voz."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Non se pode activar o correo de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Aínda podes chamar para comprobar o correo de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Non se pode actualizar o correo de voz visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Téntao de novo cando o a conexión móbil ou wifi sexa mellor. Aínda podes chamar para comprobar o correo de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Téntao de novo cando a conexión de datos móbiles sexa mellor. Aínda podes chamar para comprobar o correo de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Téntao de novo cando o a túa conexión de datos móbiles ou wifi sexa mellor. Aínda podes chamar para comprobar o correo de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Téntao de novo cando a túa conexión de datos móbiles sexa mellor. Aínda podes chamar para comprobar o correo de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Non se pode actualizar o correo de voz visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Aínda podes chamar para comprobar o correo de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Non se pode actualizar o correo de voz visual"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Produciuse un erro"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Ponte en contacto co servizo de atención ao cliente (<xliff:g id="NUMBER">%1$s</xliff:g>) e indica o código de erro 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termos e condicións do correo de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Debes aceptar os termos e condicións de Verizon Wireless para utilizar o correo de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDebes aceptar os termos e condicións de Verizon Wireless para usar o correo de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activar correo de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Se non se aceptan os termos e condicións, desactivarase o correo de voz visual."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desactivar correo de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Se se rexeitan os termos e condicións, desactivarase a transcrición do correo de voz."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desactivar transcrición do correo de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Só poderás acceder ao correo de voz chamando ao *86. Configura un novo PIN do correo de voz para continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Establecer PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml
index 4463443..68a768b 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરી રહ્યાં છે"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"જ્યાં સુધી વિઝ્યુઅલ વૉઇસમેઇલ સંપૂર્ણપણે સક્રિય ન થાય ત્યાં સુધી તમે વૉઇસમેઇલની સૂચનાઓ પ્રાપ્ત કરી શકશો નહીં. વૉઇસમેઇલ સંપૂર્ણપણે સક્રિય ન થાય ત્યાં સુધી નવા સંદેશા પુનઃપ્રાપ્ત કરવા માટે વૉઇસમેઇલને કૉલ કરો."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરી શકતાં નથી"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"તમારા ફોન પર સેલ્યુલર કનેક્શન હોવાની ખાતરી કરો અને ફરી પ્રયાસ કરો."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"તમારા ફોન પર મોબાઇલ નેટવર્ક કનેક્શન હોવાની ખાતરી કરો અને ફરી પ્રયાસ કરો."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"એરપ્લેન મોડ બંધ કરો અને ફરી પ્રયાસ કરો."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"કોઈ કનેક્શન નથી"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"નવી વૉઇસમેઇલ્સ માટે તમને સૂચિત કરવામાં આવશે નહીં. જો તમે Wi-Fi પર છો, તો હમણાં સમન્વયિત કરીને વૉઇસમેઇલ માટે તપાસ કરી શકો છો."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"નવા વૉઇસમેઇલ માટે તમને સૂચિત કરવામાં આવશે નહીં. જો તમે Wi-Fi પર છો, તો તમે હમણાં સમન્વયિત કરીને વૉઇસમેઇલ માટે તપાસ કરી શકો છો."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"નવી વૉઇસમેઇલ્સ માટે તમને સૂચિત કરવામાં આવશે નહીં. તમારી વૉઇસમેઇલ સમન્વયિત કરવા માટે એરપ્લેન મોડ બંધ કરો."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"વૉઇસમેઇલને તપાસવા માટે તમારા ફોનને સેલ્યુલર ડેટા કનેક્શનની જરૂર છે."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"વૉઇસમેઇલને તપાસવા માટે તમારા ફોનને મોબાઇલ ડેટા કનેક્શનની જરૂર છે."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરી શકતાં નથી"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકતાં નથી"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"તમારું Wi-Fi અથવા સેલ્યુલર કનેક્શન બહેતર હોવા પર ફરી પ્રયાસ કરો. તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"તમારું સેલ્યુલર ડેટા કનેક્શન બહેતર હોવા પર ફરી પ્રયાસ કરો. તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"તમારું Wi-Fi અથવા મોબાઇલ ડેટા કનેક્શન બહેતર હોવા પર ફરી પ્રયાસ કરો. તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"તમારું મોબાઇલ ડેટા કનેક્શન બહેતર હોવા પર ફરી પ્રયાસ કરો. તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકતાં નથી"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકતાં નથી"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"કંઈક ખોટું થયું"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"કૃપા કરીને <xliff:g id="NUMBER">%1$s</xliff:g> પર ગ્રાહક સેવાનો સંપર્ક કરી અને તેમને ભૂલ કોડ 9999 કહો."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"વિઝ્યુઅલ વૉઇસમેઇલની શરતો અને નિયમો"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"વિઝ્યુઅલ વૉઇસમેઇલનો ઉપયોગ કરવા માટે તમારે Verizon Wireless ની શરતો અને નિયમોનો સ્વીકાર કરવો આવશ્યક છે:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nવિઝ્યુઅલ વૉઇસમેઇલનો ઉપયોગ કરવા માટે તમારે Verizon Wireless નાં નિયમો અને શરતોને સ્વીકારવી આવશ્યક છે:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"વિઝ્યુઅલ વૉઇસમેઇલ ચાલુ કરો"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"જો શરતો અને નિયમો નકારવામાં આવે છે તો વિઝ્યુઅલ વૉઇસમેઇલ અક્ષમ કરવામાં આવશે."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"વિઝ્યુઅલ વૉઇસમેઇલ અક્ષમ કરો"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"જો શરતો અને નિયમો નકારવામાં આવે તો વૉઇસમેઇલ ટ્રાંસ્ક્રિપ્શન અક્ષમ કરવામાં આવશે."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"વૉઇસમેઇલ ટ્રાંસ્ક્રિપ્શન અક્ષમ કરો"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"વૉઇસમેઇલ માત્ર *86 પર કૉલ કરીને જ ઍક્સેસ કરી શકાશે. આગળ વધવા માટે નવો વૉઇસમેઇલ PIN સેટ કરો."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN સેટ કરો"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml
index fb1b186..5cf42e3 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"विज़ुअल वॉइसमेल सक्रिय किया जा रहा है"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"विज़ुअल वॉइसमेल के पूरी तरह सक्रिय होने तक हो सकता है कि आपको वॉइसमेल नोटिफ़िकेशन प्राप्त ना हों. वॉइसमेल के पूरी तरह सक्रिय होने तक नए संदेश प्राप्त करने के लिए वॉइसमेल को कॉल करें."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"विज़ुअल वॉइसमेल सक्रिय नहीं किया जा सकता"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"सुनिश्चित करें कि आपके फ़ोन में सेल्यूलर कनेक्शन है और फिर से प्रयास करें."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"सुनिश्चित करें कि आपके फ़ोन में मोबाइल नेटवर्क कनेक्शन है और दोबारा कोशिश करें."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"हवाई जहाज़ मोड बंद करें और फिर से प्रयास करें."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"कोई कनेक्शन नहीं"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"आपको नए वॉइसमेल के लिए सूचित नहीं किया जाएगा. यदि आप वाई-फ़ाई पर हैं, तो आप समन्वयित करके अभी वॉइसमेल देख सकते हैं."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"आपको नए वॉइसमेल की सूचना नहीं दी जाएगी. अगर आप Wi‑Fi का उपयोग कर रहे हैं, तो अभी सिंक करके वॉइसमेल देख सकते हैं."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"आपको नए वॉइसमेल के लिए सूचित नहीं किया जाएगा. अपना वॉइसमेल समन्वयित करने के लिए हवाई जहाज़ मोड बंद करें."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"वॉइसमेल देखने के लिए आपके फ़ोन में सेल्यूलर डेटा की आवश्यकता होगी."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"वॉइसमेल देखने के लिए आपके फ़ोन में मोबाइल डेटा कनेक्शन होना चाहिए."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"विज़ुअल वॉइसमेल सक्रिय नहीं किया जा सकता"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"आप वॉइसमेल देखने के लिए अभी भी कॉल कर सकते हैं."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"अपना वाई-फ़ाई या सेल्यूलर कनेक्शन बेहतर होने पर फिर से प्रयास करें. आप वॉइसमेल देखने के लिए अभी भी कॉल कर सकते हैं."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"अपना सेल्यूलर डेटा कनेक्शन बेहतर होने पर फिर से प्रयास करें. आप वॉइसमेल देखने के लिए अभी भी कॉल कर सकते हैं."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"आपका Wi‑Fi या मोबाइल डेटा कनेक्शन बेहतर होने पर दोबारा कोशिश करें. आप अभी भी वॉइसमेल देखने के लिए कॉल कर सकते हैं."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"आपका मोबाइल डेटा कनेक्शन बेहतर होने पर दोबारा कोशिश करें. आप अभी भी वॉइसमेल देखने के लिए कॉल कर सकते हैं."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"आप वॉइसमेल देखने के लिए अभी भी कॉल कर सकते हैं."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"कुछ गलत हुआ"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"कृपया <xliff:g id="NUMBER">%1$s</xliff:g> पर ग्राहक सेवा से संपर्क करें और उन्हें बताएं कि गड़बड़ी कोड 9999 है."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"विज़ुअल वॉइसमेल नियम और शर्तें"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"विज़ुअल वॉइसमेल का उपयोग करने के लिए आपको Verizon वायरलेस के नियम और शर्तों को स्वीकार करना होगा:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nआपको विज़ुअल वॉइसमेल का उपयोग करने के लिए Verizon Wireless के नियम और शर्तों को स्वीकार करना होगा:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"विज़ुअल वॉयसमेल चालू करें"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"नियम और शर्तों को अस्वीकार किए जाने पर विज़ुअल वॉइसमेल अक्षम कर दिया जाएगा."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"विज़ुअल वॉइसमेल अक्षम करें"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"अगर नियम और शर्तों को अस्वीकार कर दिया जाता है, तो वॉइसमेंल ट्रांसक्रिप्शन अक्षम हो जाएगा."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"वॉइसमेल ट्रांसक्रिप्शन अक्षम करें"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"वॉइसमेल को केवल *86 पर कॉल करके एक्सेस किया जा सकेगा. आगे बढ़ने के लिए नया वॉइसमेल पिन सेट करें."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"पिन सेट करें"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml
index a310d59..46bee91 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiviranje vizualne govorne pošte"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Možda nećete primiti obavijesti o govornoj pošti dok se vizualna govorna pošta u potpunosti ne aktivira. Nazovite službu za govornu poštu da biste dohvatili nove poruke dok se govorna pošta u potpunosti ne aktivira."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizualna govorna pošta ne može se aktivirati"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Provjerite mobilnu vezu telefona i pokušajte ponovno."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Provjerite mobilnu vezu telefona i pokušajte ponovno."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Isključite način rada u zrakoplovu i pokušajte ponovno."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nema veze"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nećete primati obavijesti o novim govornim porukama. Ako upotrebljavate Wi-Fi mrežu, govornu poštu možete provjeriti tako da se odmah sinkronizirate."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nećete primati obavijesti o novim govornim porukama. Ako upotrebljavate Wi-Fi mrežu, govornu poštu možete provjeriti tako da se odmah sinkronizirate."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nećete primati obavijesti o novim govornim porukama. Isključite način rada u zrakoplovu da biste sinkronizirali govornu poštu."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefon mora imati mobilnu podatkovnu vezu da biste provjerili govornu poštu."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefon mora imati mobilnu podatkovnu vezu da biste provjerili govornu poštu."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizualna govorna pošta ne može se aktivirati"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"I dalje možete nazvati govornu poštu i provjeriti je."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizualna govorna pošta ne može se ažurirati"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Pokušajte ponovno kad uspostavite bolju Wi-Fi ili mobilnu vezu. I dalje možete nazvati govornu poštu i provjeriti je."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Pokušajte ponovno kad uspostavite bolju mobilnu podatkovnu vezu. I dalje možete nazvati govornu poštu i provjeriti je."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Pokušajte ponovno kad uspostavite bolju Wi-Fi ili mobilnu vezu. I dalje možete nazvati govornu poštu i provjeriti je."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Pokušajte ponovno kad uspostavite bolju mobilnu podatkovnu vezu. I dalje možete nazvati govornu poštu i provjeriti je."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizualna govorna pošta ne može se ažurirati"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"I dalje možete nazvati govornu poštu i provjeriti je."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizualna govorna pošta ne može se ažurirati"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Nešto je pošlo po zlu"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Obratite se korisničkoj službi na broj <xliff:g id="NUMBER">%1$s</xliff:g> i recite da je kôd pogreške 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Uvjeti i odredbe za vizualnu govornu poštu"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Da biste koristili vizualnu govornu poštu morate prihvatiti uvjete i odredbe Verizon Wirelessa:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDa biste koristili vizualnu govornu poštu, morate prihvatiti uvjete i odredbe Verizon Wirelessa:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Uključivanje vizualne govorne pošte"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ako odbijete uvjete i odredbe, onemogućit ćete vizualnu govornu poštu."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Onemogući vizualnu govornu poštu"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ako odbijete uvjete i odredbe, onemogućit ćete prijepis govorne pošte."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Onemogućavanje prijepisa govorne pošte"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Govornoj pošti moći će se pristupiti samo pozivanjem broja *86. Postavite novi PIN za govornu poštu da biste nastavili."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Postavljanje PIN-a"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml
index cc3eb7e..5d3915d 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Vizuális hangpostaüzenetek aktiválása"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"A vizuális hangposta teljes aktiválásáig nem feltétlenül kap értesítést a hangpostaüzenetekről. A szolgáltatás teljes aktiválásáig a hangpostát felhívva kérheti le új üzeneteit."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nem sikerült aktiválni a vizuális hangpostaüzeneteket"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Győződjön meg róla, hogy van adatkapcsolat, és próbálja újra."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Győződjön meg róla, hogy van mobil-adatkapcsolat, és próbálja újra."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Kapcsolja ki a repülős üzemmódot, és próbálja újra."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nincs kapcsolat"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nem kap értesítést az új hangpostaüzenetekről. Ha Wi-Fi-t használ, szinkronizálással lekérheti a hangpostaüzeneteket."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nem kap értesítést az új hangpostaüzenetekről. Ha Wi-Fi-t használ, szinkronizálással lekérheti a hangpostaüzeneteket."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nem kap értesítést az új hangpostaüzenetekről. Kapcsolja ki a repülős üzemmódot, és szinkronizálja a hangpostaüzeneteket."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"A hangpostaüzenetek lekéréshez adatkapcsolattal kell rendelkeznie."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"A hangpostaüzenetek lekéréshez adatkapcsolattal kell rendelkeznie."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nem sikerült aktiválni a vizuális hangpostaüzeneteket"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nem sikerült frissíteni a vizuális hangpostaüzeneteket"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Próbálja újra, amikor a Wi-Fi- vagy adatkapcsolat erősebb lesz. Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Próbálja újra, amikor az adatkapcsolat erősebb lesz. Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Próbálja újra, amikor a Wi-Fi- vagy adatkapcsolat erősebb lesz. Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Próbálja újra, amikor a mobil-adatkapcsolat erősebb lesz. Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nem sikerült frissíteni a vizuális hangpostaüzeneteket"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nem sikerült frissíteni a vizuális hangpostaüzeneteket"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Hiba történt"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9999-es hibakódot: <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"A vizuális hangposta általános szerződési feltételei"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"A vizuális hangposta használatához el kell fogadnia a Verizon Wireless általános szerződési feltételeit:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nA virtuális hangposta használatához el kell fogadnia a Verizon Wireless Általános Szerződési Feltételeit:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"A vizuális hangposta bekapcsolása"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ha nem fogadja el az általános szerződési feltételeket, letiltjuk a vizuális hangpostát."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"A vizuális hangposta letiltása"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ha nem fogadja el az általános szerződési feltételeket, letiltjuk a hangpostaüzenetek átírását."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Hangpostaüzenetek átírásának letiltása"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"A hangpostát a *86 számot tárcsázva érheti el. A folytatáshoz állítson be új PIN-kódot."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN-kód beállítása"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml
index 4a9c2ed..60b6ce5 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ձայնային փոստի ցուցադրման ակտիվացում"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա, քանի որ չեք ակտիվացրել ձայնային փոստի ցուցադրումը: Մինչ այդ, նոր հաղորդագրությունները լսելու համար զանգեք ձայնային փոստի ծառայություն:"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Չհաջողվեց ակտիվացնել ձայնային փոստի ցուցադրումը"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Համոզվեք, որ հեռախոսը միացած է բջջային ցանցին և նորից փորձեք:"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Համոզվեք, որ հեռախոսը միացած է բջջային ցանցին և նորից փորձեք:"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Անջատեք ինքնաթիռի ռեժիմը և նորից փորձեք:"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Կապ չկա"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Նոր ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա: Եթե միացած եք Wi-Fi-ին, կարող եք ստուգել ձայնային փոստը՝ կատարելով համաժամեցում:"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Նոր ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա: Եթե միացած եք Wi-Fi-ին, կարող եք ստուգել ձայնային փոստը՝ կատարելով համաժամեցում:"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Նոր ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա: Անջատեք ինքնաթիռի ռեժիմը՝ ձայնային փոստը համաժամեցնելու համար:"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Ձայնային փոստը ստուգելու համար ձեր հեռախոսի բջջային ինտերնետը պետք է միացած լինի:"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Ձայնային փոստը ստուգելու համար ձեր հեռախոսի բջջային ինտերնետը պետք է միացած լինի:"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Չհաջողվեց ակտիվացնել ձայնային փոստի ցուցադրումը"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Նորից փորձեք, երբ Wi-Fi-ը կամ բջջային կապը լավանա: Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Նորից փորձեք, երբ բջջային ինտերնետը լավանա: Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Նորից փորձեք, երբ Wi-Fi-ը կամ բջջային ինտերնետը լավանա: Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Նորից փորձեք, երբ բջջային ինտերնետը լավանա: Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Սխալ առաջացավ"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"<xliff:g id="NUMBER">%1$s</xliff:g> համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9999 կոդը:"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Տեսողական ձայնային փոստի օգտագործման պայմաններ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Տեսողական ձայնային փոստն օգտագործելու համար ընդունեք Verizon Wireless-ի օգտագործման պայմանները՝\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nՏեսողական ձայնային փոստն օգտագործելու համար ընդունեք Verizon Wireless-ի օգտագործման պայմանները՝\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Միացնել տեսողական ձայնային փոստը"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Եթե չընդունեք օգտագործման պայմանները, տեսողական ձայնային փոստը կանջատվի:"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Անջատել տեսողական ձայնային փոստը"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Եթե չընդունեք օգտագործման պայմանները, ձայնային փոստի տառադրումը կանջատվի:"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Անջատել ձայնային փոստի տառադրումը"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Ձայնային փոստը հասանելի կլինի միայն *86 համարով: Շարունակելու համար ընտրեք ձայնային փոստի նոր PIN:"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Ընտրել PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml
index 948afae..eed7a37 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Mengaktifkan pesan suara visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Anda mungkin tidak menerima pemberitahuan pesan suara hingga visual pesan suara sepenuhnya diaktifkan. Panggil pesan suara untuk mengambil pesan baru hingga pesan suara sepenuhnya diaktifkan."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Tidak dapat mengaktifkan pesan suara visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Pastikan ponsel Anda memiliki koneksi seluler, lalu coba lagi."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Pastikan ponsel memiliki koneksi jaringan seluler, dan coba lagi."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Nonaktifkan mode pesawat, lalu coba lagi."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Tidak ada sambungan internet"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Anda tidak akan menerima notifikasi pesan suara baru. Jika menggunakan Wi-Fi, pesan suara dapat diperiksa dengan menyinkronkannya sekarang."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Anda tidak akan menerima notifikasi pesan suara baru. Jika menggunakan Wi-Fi, pesan suara dapat diperiksa dengan menyinkronkannya sekarang."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Anda tidak akan menerima notifikasi pesan suara baru. Nonaktifkan mode pesawat untuk menyinkronkan pesan suara."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Ponsel Anda memerlukan koneksi data seluler untuk memeriksa pesan suara."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Ponsel memerlukan koneksi data seluler untuk memeriksa pesan suara."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Tidak dapat mengaktifkan pesan suara visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Anda masih dapat menelepon untuk memeriksa pesan suara."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Tidak dapat memperbarui pesan suara visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Coba lagi ketika koneksi Wi-Fi atau seluler lebih baik. Anda masih dapat menelepon untuk memeriksa pesan suara."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Coba lagi ketika koneksi data seluler lebih baik. Anda masih dapat menelepon untuk memeriksa pesan suara."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Coba lagi ketika koneksi Wi-Fi atau data seluler lebih baik. Anda masih bisa menelepon untuk memeriksa pesan suara."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Coba lagi ketika koneksi data seluler lebih baik. Anda masih bisa menelepon untuk memeriksa pesan suara."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Tidak dapat memperbarui pesan suara visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Anda masih dapat menelepon untuk memeriksa pesan suara."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Tidak dapat memperbarui pesan suara visual"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Terjadi Kesalahan"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Hubungi Layanan Pelanggan melalui nomor telepon <xliff:g id="NUMBER">%1$s</xliff:g> dan beri tahukan kode kesalahan 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Persyaratan dan Ketentuan Pesan Suara Visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Anda harus menerima persyaratan dan ketentuan Verizon Wireless untuk menggunakan pesan suara visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nAnda harus menerima persyaratan dan ketentuan Verizon Wireless untuk menggunakan pesan suara visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Aktifkan Pesan Suara Visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Pesan suara visual akan dinonaktifkan jika persyaratan dan ketentuan ditolak."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Nonaktifkan pesan suara visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripsi pesan suara akan dinonaktifkan jika persyaratan dan ketentuan ditolak."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Nonaktifkan transkripsi pesan suara"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Pesan suara hanya dapat diakses dengan menghubungi *86. Setel PIN pesan suara baru untuk melanjutkan."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Setel PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml
index ae0497e..5965a04 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Virkjar myndrænt talhólf"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Þú getur ekki fengið tilkynningar um talhólfsskilaboð fyrr en myndrænt talhólf er virkjað að fullu. Hringdu í talhólfið til að sækja ný skilaboð þar til talhólfið hefur verið virkjað að fullu."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Ekki hægt að virkja myndrænt talhólf"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Gakktu úr skugga um að síminn sé tengdur farsímakerfi og reyndu aftur."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Gakktu úr skugga um að síminn sé tengdur farsímakerfi og reyndu aftur."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Slökktu á flugstillingu og reyndu aftur."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Engin tenging"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Þú færð ekki tilkynningu um ný talhólfsskilaboð. Ef þú ert með Wi-Fi tengingu geturðu athugað talhólfið með því að samstilla núna."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Þú færð ekki tilkynningar um ný talhólfsskilaboð. Ef þú ert með Wi-Fi tengingu geturðu athugað talhólfið með því að samstilla núna."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Þú færð ekki tilkynningu um ný talhólfsskilaboð. Slökktu á flugstillingu til að samstilla talhólfið."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Síminn þarf tengingu við farsímanet til að athuga talhólf."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Síminn þarf tengingu við farsímanet til að athuga talhólf."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Ekki hægt að virkja myndrænt talhólf"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Þú getur samt hringt til að athuga talhólfið."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Ekki hægt að uppfæra sjónrænt talhólf"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Reyndu aftur þegar Wi-Fi eða farsímanettengingin þín er betri. Þú getur samt hringt til að athuga talhólfið."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Reyndu aftur þegar farsímanettengingin þín er betri. Þú getur samt hringt til að athuga talhólfið."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Reyndu aftur þegar Wi-Fi eða farsímanettengingin þín er betri. Þú getur samt hringt til að athuga talhólfið."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Reyndu aftur þegar farsímanettengingin þín er betri. Þú getur samt hringt til að athuga talhólfið."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Ekki hægt að uppfæra sjónrænt talhólf"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Þú getur samt hringt til að athuga talhólfið."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Ekki hægt að uppfæra sjónrænt talhólf"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Eitthvað fór úrskeiðis"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Hafðu samband við þjónustudeild í síma <xliff:g id="NUMBER">%1$s</xliff:g> og gefðu upp villukóðann 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Skilmálar myndræns talhólfs"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Þú verður að samþykkja skilmála Verizon Wireless til að geta notað myndrænt talhólf:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nÞú verður að samþykkja skilmála Verizon Wireless til að nota myndrænt talhólf:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Kveikja á myndrænu talhólfi"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Slökkt verður á myndrænu talhólfi ef skilmálum er hafnað."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Slökkva á myndrænu talhólfi"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Slökkt verður á umritun talhólfsskilaboða ef skilmálarnir eru ekki samþykktir."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Slökkva á umritun talhólfsskilaboða"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Talhólf er einungis aðgengilegt með því að hringja í *86. Stilltu nýtt PIN-númer fyrir talhólfið til að halda áfram."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Stilla PIN-númer"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml
index 1df608a..0133be5 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Attivazione della lettura della segreteria"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Potresti non ricevere le notifiche dei messaggi vocali fino a che non avrai attivato completamente la funzione di lettura della segreteria. Fino ad allora, chiama la segreteria per recuperare i nuovi messaggi."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Impossibile attivare la lettura della segreteria"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Assicurati che il telefono abbia una connessione alla rete dati e riprova."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Assicurati che il telefono abbia una connessione alla rete mobile e riprova."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Disattiva la modalità aereo e riprova."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nessuna connessione"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Non riceverai notifiche per i nuovi messaggi vocali. Se sei connesso a una rete Wi-Fi, puoi consultare la segreteria effettuando subito la sincronizzazione."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Non riceverai notifiche per i nuovi messaggi vocali. Se sei connesso a una rete Wi-Fi, puoi consultare la segreteria effettuando subito la sincronizzazione."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Non riceverai notifiche per i nuovi messaggi vocali. Disattiva la modalità aereo per sincronizzare la segreteria."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Per poter consultare la segreteria, il telefono deve essere connesso a una rete dati."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Per poter consultare la segreteria, il telefono deve essere connesso a una rete mobile."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Impossibile attivare la lettura della segreteria"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Puoi ancora consultare la segreteria tramite chiamata."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Impossibile aggiornare la lettura della segreteria"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Riprova quando la connessione alla rete Wi-Fi o dati sarà migliore. Puoi ancora consultare la segreteria tramite chiamata."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Riprova quando la connessione alla rete dati sarà migliore. Puoi ancora consultare la segreteria tramite chiamata."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Riprova quando la connessione alla rete Wi-Fi o mobile sarà migliore. Puoi ancora consultare la segreteria tramite chiamata."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Riprova quando la connessione dati mobile sarà migliore. Puoi ancora consultare la segreteria tramite chiamata."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Impossibile aggiornare la lettura della segreteria"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Puoi ancora consultare la segreteria tramite chiamata."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Impossibile aggiornare la lettura della segreteria"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Si è verificato un problema"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Contatta l\'assistenza clienti al numero <xliff:g id="NUMBER">%1$s</xliff:g> indicando il seguente codice di errore: 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termini e condizioni della lettura della segreteria"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Devi accettare i termini e condizioni di Verizon Wireless per utilizzare la lettura della segreteria:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDevi accettare termini e condizioni di Verizon Wireless per utilizzare la lettura della segretaria:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Attiva la lettura della segreteria"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"La lettura della segreteria verrà disattivata se non accetti i termini e condizioni."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Disattiva la lettura della segreteria"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"La trascrizione della segreteria verrà disattivata se non accetti termini e condizioni."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Disattiva la trascrizione della segreteria"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"La segreteria sarà accessibile unicamente chiamando il numero *86. Imposta un nuovo PIN per la segreteria per procedere."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Imposta PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml
index c05a02f..a3fce07 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"מפעיל את הדואר הקולי הוויזואלי"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ייתכן שלא תקבל עדכונים על הודעות חדשות בדואר הקולי עד שהדואר הקולי הוויזואלי יופעל במלואו. עד אז, תצטרך להתקשר לדואר הקולי כדי להאזין להודעות החדשות."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"לא ניתן להפעיל את הדואר הקולי הוויזואלי"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ודא שלטלפון יש חיבור לרשת סלולרית ונסה שוב."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ודא שהטלפון מחובר לרשת סלולרית ונסה שוב."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"השבת את מצב טיסה ונסה שוב."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"אין חיבור"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"‏לא תקבל עדכונים על הודעות חדשות בדואר הקולי. אם אתה משתמש בחיבור Wi-Fi, סנכרן עכשיו כדי לבדוק את הדואר הקולי."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"‏לא תקבל עדכונים על הודעות קוליות חדשות. אם אתה משתמש בחיבור Wi-Fi, סנכרן עכשיו כדי לבדוק אם יש לך הודעות קוליות."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"לא תקבל עדכונים על הודעות חדשות בדואר הקולי. השבת את מצב הטיסה כדי לסנכרן את הדואר הקולי שלך."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"כדי שתוכל לבדוק את הדואר הקולי, נדרש חיבור לנתונים סלולריים בטלפון."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"כדי לבדוק הודעות קוליות נדרש חיבור לרשת סלולרית בטלפון."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"לא ניתן להפעיל את הדואר הקולי הוויזואלי"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"לא ניתן לעדכן את הדואר הקולי הוויזואלי"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"‏נסה שוב כשיהיה חיבור טוב יותר ל-Wi-Fi או לרשת הסלולרית. עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"נסה שוב כשיהיה חיבור טוב יותר לרשת הסלולרית. עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"‏נסה שוב כשיהיה חיבור טוב יותר ל-Wi-Fi או לרשת הסלולרית. אפשר גם להתקשר כדי לבדוק הודעות קוליות."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"נסה שוב כשיהיה חיבור טוב יותר לרשת הסלולרית. אפשר גם להתקשר כדי לבדוק הודעות קוליות."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"לא ניתן לעדכן את הדואר הקולי הוויזואלי"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"לא ניתן לעדכן את הדואר הקולי הוויזואלי"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"משהו השתבש"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"התקשר לשירות הלקוחות בטלפון <xliff:g id="NUMBER">%1$s</xliff:g> ואמור לנציג שקוד השגיאה הוא 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"התנאים וההגבלות של הדואר הקולי הוויזואלי"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"‏עליך לקבל את התנאים וההגבלות של Verizon Wireless כדי להשתמש בדואר הקולי הוויזואלי:\n\n‎%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"‏%1$s\n\nעליך לאשר את התנאים וההגבלות של Verizon Wireless כדי להשתמש בדואר הקולי הוויזואלי:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"הפעלה של דואר קולי ויזואלי"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"‎%s‎"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"אם תדחה את התנאים וההגבלות הדואר הקולי הוויזואלי יושבת."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"השבת את הדואר הקולי הוויזואלי"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"אם התנאים וההגבלות לא יאושרו, התמלולים של ההודעות הקוליות יושבתו."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"השבתת התמלולים של ההודעות הקוליות"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"תוכל לבדוק את הדואר הקולי רק על ידי חיוג 86*. כדי להמשיך, הגדר קוד גישה חדש לדואר הקולי."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"הגדרת קוד גישה"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml
index 5d47a9c..dc4bc90 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ビジュアル ボイスメールを有効化中"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ビジュアル ボイスメールの有効化が完了するまでボイスメール通知を受信できません。ボイスメールの有効化が完了するまでは、ボイスメールを呼び出して新しいメッセージを取得してください。"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ビジュアル ボイスメールを有効化できません"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"スマートフォンがモバイル ネットワークに接続済みであることを確認してから、もう一度お試しください。"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"スマートフォンがモバイル ネットワークに接続済みであることを確認してから、もう一度お試しください。"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"機内モードをオフにしてから、もう一度お試しください。"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"接続なし"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"新しいボイスメールの通知を受信できません。Wi-Fi をご利用の場合、同期してボイスメールを確認できます。"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"新しいボイスメールの通知を受信できません。Wi-Fi をご利用の場合は同期してボイスメールを確認できます。"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"新しいボイスメールの通知を受信できません。ボイスメールを同期するには機内モードをオフにしてください。"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ボイスメールを確認するには、スマートフォンでモバイルデータ接続を使用する必要があります。"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ボイスメールを確認するには、スマートフォンでモバイルデータ接続を使用する必要があります。"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ビジュアル ボイスメールを有効化できません"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ビジュアル ボイスメールを更新できません"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fi かモバイルデータの接続状態が良好なときにもう一度お試しください。ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"モバイルデータの接続状態が良好なときにもう一度お試しください。ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Wi-Fi かモバイルデータの接続状態が良好なときにもう一度お試しください。ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"モバイルデータの接続状態が良好なときにもう一度お試しください。ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ビジュアル ボイスメールを更新できません"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ビジュアル ボイスメールを更新できません"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"エラー"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"カスタマー サービス（<xliff:g id="NUMBER">%1$s</xliff:g>）にご連絡いただき、エラーコード 9999 をお伝えください。"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ビジュアル ボイスメールの利用規約"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ビジュアル ボイスメールを利用するには Verizon Wireless の利用規約に同意していただく必要があります。\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nビジュアル ボイスメールを利用するには Verizon Wireless の利用規約に同意していただく必要があります。\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ビジュアル ボイスメールの有効化"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"利用規約に同意いただけない場合は、ビジュアル ボイスメールが無効となります。"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ビジュアル ボイスメールを無効にする"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"利用規約に同意いただけない場合は、ボイスメールの音声文字変換が無効になります。"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ボイスメールの音声文字変換を無効にする"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*86 への発信によってのみ、ボイスメールにアクセスできます。続行するには、新しいボイスメール PIN を設定してください。"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN の設定"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml
index c5f6a12..f6d21b4 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ვიზუალური ხმოვანი ფოსტა აქტიურდება"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ვიზუალური ხმოვანი ფოსტის სრულად გააქტიურებამდე შეიძლება ხმოვანი ფოსტის შეტყობინებები არ მიიღოთ. დარეკეთ ხმოვან ფოსტაში, რათა მიიღოთ ახალი შეტყობინებები ხმოვანი ფოსტის ბოლომდე გააქტიურებამდე."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ვიზუალური ხმოვანი ფოსტის გააქტიურება შეუძლებელია"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"დარწმუნდით, რომ თქვენს ტელეფონს აქვს ფიჭური კავშირი და სცადეთ ხელახლა."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"დარწმუნდით, რომ თქვენს ტელეფონს აქვს მობილურ ქსელთან კავშირი და სცადეთ ხელახლა."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"გამორთეთ თვითმფრინავის რეჟიმი და სცადეთ ხელახლა."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"კავშირი არ არის"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ახალი ხმოვანი ფოსტის შესახებ არ გეცნობებათ. თუ იყენებთ Wi-Fi-ს, შეგიძლიათ ახლავე შეამოწმოთ ხმოვანი ფოსტა სინქრონიზაციის მეშვეობით."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ახალი ხმოვანი ფოსტის შესახებ შეტყობინებას არ მიიღებთ. თუ იყენებთ Wi-Fi-ს, შეგიძლიათ შეამოწმოთ ხმოვანი ფოსტა ახლავე სინქრონიზაციის მეშვეობით."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ახალი ხმოვანი ფოსტის შესახებ არ გეცნობებათ. გამორთეთ თვითმფრინავის რეჟიმი ხმოვანი ფოსტის სინქრონიზაციისთვის."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ხმოვანი ფოსტის შესამოწმებლად თქვენი ტელეფონი საჭიროებს მობილურ ინტერნეტთან კავშირს."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ხმოვანი ფოსტის შესამოწმებლად თქვენი ტელეფონი საჭიროებს მობილურ ინტერნეტთან კავშირს."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ვიზუალური ხმოვანი ფოსტის გააქტიურება შეუძლებელია"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"სცადეთ ხელახლა, როდესაც Wi-Fi ან ფიჭური კავშირი გაუმჯობესდება. ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"სცადეთ ხელახლა, როდესაც ფიჭური კავშირი გაუმჯობესდება. ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"სცადეთ ხელახლა, როდესაც Wi‑Fi ან მობილურ ინტერნეტთან კავშირი გაუმჯობესდება. ხმოვანი ფოსტის შესამოწმებლად დარეკვა ახლაც შეგიძლიათ."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"სცადეთ ხელახლა, როდესაც მობილურ ინტერნეტთან კავშირი გაუმჯობესდება. ხმოვანი ფოსტის შესამოწმებლად დარეკვა ახლაც შეგიძლიათ."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"მოხდა რაღაც შეცდომა"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე <xliff:g id="NUMBER">%1$s</xliff:g> და უთხრათ, რომ შეცდომის კოდია 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ვიზუალური ხმოვანი ფოსტის მომსახურების პირობები"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"თქვენ უნდა დაეთანხმოთ Verizon Wireless-ის მომსახურების პირობებს, რათა გამოიყენოთ ვიზუალური ხმოვანი ფოსტა:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nვიზუალური ხმოვანი ფოსტის გამოსაყენებლად თქვენ უნდა დაეთანხმოთ Verizon Wireless-ის მომსახურების პირობებს:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ვიზუალური ხმოვანი ფოსტის ჩართვა"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"თუ მომსახურების პირობებს უარყოფთ, ვიზუალური ხმოვანი ფოსტა გამოირთვება."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ვიზუალური ხმოვანი ფოსტის გამორთვა"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"მომსახურების პირობების უარყოფის შემთხვევაში ხმოვანი ფოსტის ტრანსკრიბირება გამოირთვება."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ხმოვანი ფოსტის ტრანსკრიბირების გამორთვა"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"ხმოვანი ფოსტა ხელმისაწვდომი იქნება მხოლოდ *86-ზე დარეკვით. გასაგრძელებლად დააყენეთ ხმოვანი ფოსტის ახალი PIN-კოდი."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"დააყენეთ PIN-კოდი"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml
index ad164c8..ed37db3 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Визуалды дауыстық хабарды іске қосу"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Визуалды дауыстық пошта толығымен белсендірілгенше, дауыстық пошта хабарландыруларын қабылдай алмайсыз. Дауыстық пошта толығымен белсендірілгенше, жаңа хабарлар шығарып алу үшін дауыстық поштаға қоңырау шалыңыз."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Визуалды дауыстық хабарды іске қосу мүмкін болмады"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Телефоныңыздың ұялы байланысын тексеріп, әрекетті қайталаңыз."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Телефоныңыздың мобильдік байланысын тексеріп, әрекетті қайталаңыз."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Ұшақ режимін өшіріп, әрекетті қайталаңыз."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Байланыс жоқ"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Жаңа дауыстық хабарлар туралы сізге хабарланбайды. Wi-Fi байланысыңыз болса, дауыстық хабарды қазір синхрондау арқылы тексере аласыз."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Сізге жаңа дауыстық хабарлар туралы ескерту жіберілмейді. Егер Wi-Fi байланысын қолдансаңыз, қазір синхрондап, дауыстық хабарларды қазір тексеруіңізге болады."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Жаңа дауыстық хабарлар туралы сізге хабарланбайды. Дауыстық хабарды синхрондау үшін ұшақ режимін өшіріңіз."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Дауыстық хабарды тексеру үшін телефоныңызда ұялы деректер байланысы болуы керек."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Дауыстық хабарларды тексеру үшін телефоныңызда мобильдік байланыс болуы керек."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Визуалды дауыстық хабарды іске қосу мүмкін болмады"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Визуалды дауыстық хабарды жаңарту мүмкін болмады."</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fi немесе ұялы байланыс жақсарғанда, әрекетті қайталаңыз. Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Ұялы деректер байланысы жақсарғанда, әрекетті қайталаңыз. Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Wi-Fi немесе мобильдік байланыс жақсарғанда қайталап көріңіз. Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Мобильдік байланыс жақсарғанда қайталап көріңіз. Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Визуалды дауыстық хабарды жаңарту мүмкін болмады"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Визуалды дауыстық хабарды жаңарту мүмкін болмады"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Бірдеңе дұрыс болмады"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Тұтынушыларға қызмет көрсету орталығына <xliff:g id="NUMBER">%1$s</xliff:g> бойынша хабарласыңыз және қате коды 9999 екенін айтыңыз."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Визуалды дауыстық хабар функциясының шарттары мен талаптары"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Визуалды дауыстық хабар функциясын қолдану үшін Verizon Wireless шарттарын қабылдауыңыз қажет:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nВизуалды дауыстық хабар функциясын қолдану үшін Verizon Wireless шарттарын қабылдауыңыз қажет:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Visual дауыстық хабарын қосу"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Шарттары мен талаптары қабылданбаса, визуалды дауыстық хабар функциясы өшіріледі."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Визуалды дауыстық хабар функциясын өшіру"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Шарттары мен талаптары қабылданбаса, визуалды дауыстық хабар транскрипциясы өшіріледі."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Дауыстық хабар транскрипциясын өшіру"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Дауыстық хабарлар поштасына кіру *86 нөміріне қоңырау шалғанда ғана мүмкін болады. Жалғастыру үшін жаңа PIN кодын тағайындаңыз."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN кодын тағайындау"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml
index f0ebf04..4b37c8b 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ធ្វើ​ឲ្យ​សកម្ម​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"អ្នក​ប្រហែលជា​​មិន​ទទួល​បាន​ការ​ជូនដំណឹង​ជា​សារ​សំឡេង​រហូត​​ទាល់តែ​ធ្វើ​ឲ្យ​សកម្ម​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​ពេញលេញ​​។ ហៅ​ជា​សារ​សំឡេង​ដើម្បី​​ទទួល​បាន​សារ​ថ្មី​រហូត​សារ​ជា​សំឡេង​ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម​ពេញលេញ។"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"មិន​អាច​ធ្វើ​ឲ្យ​សកម្ម​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​បាន​ទេ"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"សូម​ប្រាកដ​ថា​ទូរសព្ទ​របស់​អ្នក​​បាន​ភ្ជាប់​​បណ្ដាញ​អ៊ីនធឺណិត និង​​ព្យាយាម​​ម្ដង​ទៀត។"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ប្រាកដ​ថា ទូរសព្ទ​របស់​អ្នក​មាន​ភ្ជាប់​បណ្ដាញ​ទូរសព្ទ​ចល័ត រួច​ព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"បិទ​របៀប​លើ​យន្តហោះ និង​ព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"គ្មាន​បណ្ដាញ​អ៊ីនធឺណិត"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ពេល​មាន​សារ​ជា​សំឡេង​ថ្មី​នឹង​មិន​ជូន​ដំណឹង​ទៅ​អ្នក​ឡើយ។ បើ​អ្នក​​បាន​ភ្ជាប់​វ៉ាយហ្វាយ អ្នក​អាច​ឆែក​រក​មើល​សារ​ជា​សំឡេង​ដោយ​ទាញ​យក​ឥឡូវ​នេះ។"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"អ្នក​នឹង​មិន​ទទួល​បាន​ការជូនដំណឹង នៅពេល​មាន​សារ​ជា​សំឡេង​ថ្មី​ទេ។ បើ​អ្នក​​ភ្ជាប់​ទៅ Wi-Fi អ្នក​អាច​ពិនិត្យមើល​​សារ​ជា​សំឡេង​ដោយ​ធ្វើ​សមកាលកម្ម​ឥឡូវ​នេះ។"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ពេល​មាន​សារ​ជា​សំឡេង​ថ្មី​នឹង​មិន​ជូន​ដំណឹង​ទៅ​អ្នក​ឡើយ។ សូម​បិទ​របៀប​លើ​យន្តហោះ​ដើម្បី​ទាញយក​សារ​សំឡេង​របស់​អ្នក។"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ទូរសព្ទ​របស់​អ្នក​ត្រូវ​​ភ្ជាប់​អ៊ីនធឺណិតតាម​ទិន្នន័យ​ទូរសព្ទ​​​ចល័ត​ដើម្បី​អាច​ពិនិត្យ​មើល​សារ​​ជា​សំឡេង​បាន​។"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ទូរសព្ទ​របស់​អ្នក​ត្រូវ​​ភ្ជាប់​អ៊ីនធឺណិតតាម​ទិន្នន័យ​ទូរសព្ទ​​​ចល័ត​ ដើម្បី​អាច​ពិនិត្យ​មើល​សារ​​ជា​សំឡេង​បាន​។"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"មិន​អាច​ធ្វើ​ឲ្យ​សកម្ម​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​បាន​ទេ"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"អ្នក​នៅ​តែ​អាច​ហៅ​​ទូរសព្ទ​ដើម្បី​ស្ដាប់​សារ​ជា​សំឡេង។"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​បាន​​​ទេ។"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ព្យាយាម​ម្ដង​ទៀត នៅពេល​ Wi-Fi ឬ​ការតភ្ជាប់​បណ្ដាញ​ទូរសព្ទ​ចល័ត​ប្រសើរ។ អ្នក​នៅ​តែ​អាច​ហៅ​ទូរសព្ទ​ដើម្បី​​ស្ដាប់​សារ​ជា​សំឡេង​។"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ព្យាយាម​ម្ដង​ទៀត នៅពេល​​​ការតភ្ជាប់​បណ្ដាញ​ទូរសព្ទ​ចល័ត​ប្រសើរ។ អ្នក​នៅ​តែ​អាច​ហៅ​ទូរសព្ទ​ដើម្បី​​ស្ដាប់​សារ​ជា​សំឡេង​។"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ព្យាយាម​ម្ដង​ទៀត នៅពេល​មាន Wi-Fi ឬ​អ៊ីនធឺណិត​​តាម​​ទិន្នន័យ​​ទូរសព្ទ​ចល័ត​ប្រសើរ។ អ្នក​នៅ​តែ​អាច​ហៅ​ទូរសព្ទ​ ដើម្បី​​ពិនិត្យមើល​សារ​ជា​សំឡេង​​បាន។"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ព្យាយាម​ម្ដង​ទៀត នៅពេល​​​​មាន​អ៊ីនធឺណិត​តាម​ទិន្នន័យ​​ទូរសព្ទ​ចល័ត​ប្រសើរ។ អ្នក​នៅ​តែ​អាច​ហៅ​ទូរសព្ទ​ ដើម្បី​​ស្ដាប់​សារ​ជា​សំឡេង​។"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​​បាន​ទេ។"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"អ្នក​នៅ​តែ​អាច​ហៅ​​ទូរសព្ទ​ដើម្បី​ស្ដាប់​សារ​ជា​សំឡេង។"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​បាន​​​ទេ។"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"មានអ្វីមួយមិនប្រក្រតី"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"សូម​ទាក់ទង​ផ្នែក​បម្រើ​សេវា​អតិថិជន​តាមរយៈ <xliff:g id="NUMBER">%1$s</xliff:g> និង​ប្រាប់​ពួកគេ​កូដ​មាន​បញ្ហា គឺ 9999។"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"លក្ខខណ្ឌ​ប្រើប្រាស់​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"អ្នក​ត្រូវតែ​យល់ព្រម​នឹង​​លក្ខខណ្ឌ​ប្រើប្រាស់​របស់​ Verizon Wireless ដើម្បី​អាច​ប្រើប្រាស់​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ៖\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nអ្នក​ត្រូវតែ​យល់ព្រម​នឹង​​គោលការណ៍ និង​លក្ខខណ្ឌ​របស់ Verizon Wireless ដើម្បី​ប្រើប្រាស់​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ៖\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"បើក​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"សារ​ជា​សំឡេង​ដែល​​មើល​ឃើញ​នឹង​ត្រូវ​បាន​បិទ បើ​លក្ខខណ្ឌ​ប្រើប្រាស់​ត្រូវ​បាន​បដិសេធ។"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"បិទសារជាសំឡេងដែលមើលឃើញ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"ការធ្វើ​ប្រតិចារឹក​សារ​ជាសំឡេង​នឹង​ត្រូវ​បិទ ប្រសិនបើ​គោលការណ៍ និង​លក្ខខណ្ឌ​ត្រូវបាន​បដិសេធ។"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"បិទ​ការធ្វើ​ប្រតិចារឹក​សារ​ជា​សំឡេង"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"សារ​ជា​សំឡេង​នឹង​អាច​ចូល​ស្ដាប់​បាន​​ដោយ​ហៅ​ទៅ *86។ កំណត់​កូដ PIN នៃ​សារ​ជា​សំឡេង​ថ្មី ដើម្បី​ចាប់ផ្ដើម​ដំណើរការ។"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"កំណត់​កូដ PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml
index 7840fca..2f5169a 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಪೂರ್ಣವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸುವವರೆಗೂ ನಿಮಗೆ ಧ್ವನಿಮೇಲ್‌ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗದೇ ಇರಬಹುದು. ಧ್ವನಿಮೇಲ್‌ಗಳು ಪೂರ್ಣವಾಗಿ ಸಕ್ರಿಯವಾಗುವವರೆಗೆ ಹೊಸ ಸಂದೇಶಗಳನ್ನು ಹಿಂಪಡೆಯಲು ಧ್ವನಿಮೇಲ್‌ನಲ್ಲಿ ಕರೆಮಾಡಿ."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ನಿಮ್ಮ ಫೋನ್‌ ಸೆಲ್ಯುಲಾರ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಂತರ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ನಿಮ್ಮ ಫೋನ್‌ ಮೊಬೈಲ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಂತರ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ ಹಾಗೂ ನಂತರ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ಯಾವುದೇ ಸಂಪರ್ಕವಿಲ್ಲ"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌ಗಳ ಕುರಿತು ನಿಮಗೆ ಸೂಚಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ವೈ-ಫೈನಲ್ಲಿದ್ದರೆ, ನೀವು ಈಗಲೇ ಸಿಂಕ್ ಮಾಡುವ ಮೂಲಕ ಧ್ವನಿಮೇಲ್‌ಗೆ ಪರಿಶೀಲಿಸಬಹುದು."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌ಗಳ ಕುರಿತು ನಿಮಗೆ ಸೂಚಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ವೈ-ಫೈ ನಲ್ಲಿದ್ದರೆ, ನೀವು ಈಗಲೇ ಸಿಂಕ್ ಮಾಡುವ ಮೂಲಕ ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಬಹುದು."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌ಗಳ ಕುರಿತು ನಿಮಗೆ ಸೂಚಿಸಲಾಗುವುದಿಲ್ಲ. ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್‌ ಸಿಂಕ್ ಮಾಡಲು ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಅನ್ನು ಆಫ್ ಮಾಡಿ."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ಧ್ವನಿಮೇಲ್‌ ಅನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಫೋನ್‌‌ಗೆ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ ಸಂಪರ್ಕ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ಧ್ವನಿಮೇಲ್‌ ಅನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಫೋನ್‌‌ಗೆ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕದ ಅಗತ್ಯವಿದೆ."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ನಿಮ್ಮ ವೈ-ಫೈ ಅಥವಾ ಸೆಲ್ಯುಲಾರ್ ಸಂಪರ್ಕವು ಉತ್ತಮವಾದಾಗ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ನಿಮ್ಮ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ ಸಂಪರ್ಕವು ಉತ್ತಮವಾದಾಗ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ನಿಮ್ಮ ವೈ-ಫೈ ಅಥವಾ ಮೊಬೈಲ್ ಸಂಪರ್ಕವು ಉತ್ತಮವಾದಾಗ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ನಿಮ್ಮ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕವು ಉತ್ತಮವಾದಾಗ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"ಯಾವುದೋ ತಪ್ಪು ಸಂಭವಿಸಿದೆ"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"ಗ್ರಾಹಕ ಸೇವೆ ಸಂಖ್ಯೆ <xliff:g id="NUMBER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಿ ಮತ್ತು 9999 ದೋಷದ ಕೋಡ್‌ ಅನ್ನು ಅವರಿಗೆ ತಿಳಿಸಿ."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್‌ನ ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳು"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಬಳಸಲು ವೆರಿಜೋನ್ ವೈರ್‌ಲೆಸ್‌ನ ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳನ್ನು ನೀವು ಒಪ್ಪಿಕೊಳ್ಳಬೇಕು:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಬಳಸಲು Verizon Wireless ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳನ್ನು ನೀವು ಒಪ್ಪಿಕೊಳ್ಳಬೇಕು:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಆನ್ ಮಾಡಿ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳುಗಳನ್ನು ನಿರಾಕರಿಸಿದಲ್ಲಿ ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳನ್ನು ನಿರಾಕರಿಸಿದಲ್ಲಿ ಧ್ವನಿಮೇಲ್ ಟ್ರಾನ್ಸ್‌ಕ್ರಿಪ್ಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ಧ್ವನಿಮೇಲ್ ಟ್ರಾನ್ಸ್‌ಕ್ರಿಪ್ಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*86 ಗ ಕರೆ ಮಾಡುವ ಮೂಲಕ ಮಾತ್ರ ಧ್ವನಿಮೇಲ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯ. ಮುಂದುವರೆಯಲು ಒಂದು ಹೊಸ ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಹೊಂದಿಸಿ."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"ಪಿನ್ ಹೊಂದಿಸಿ"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml
index 092214d..00893f5 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"시각적 음성사서함 활성화 중"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"시각적 음성사서함이 완전히 활성화될 때까지 음성사서함 알림을 받지 못할 수 있습니다. 음성사서함이 완전히 활성화될 때까지 음성사서함으로 전화하여 새 메시지를 가져오세요."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"시각적 음성사서함을 활성화할 수 없음"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"휴대전화가 모바일 데이터에 연결되었는지 확인한 다음 다시 시도해 주세요."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"휴대전화가 모바일 네트워크에 연결되었는지 확인한 다음 다시 시도해 주세요."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"비행기 모드를 사용 중지한 다음 다시 시도해 주세요."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"네트워크 연결 없음"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"새로운 음성사서함에 대한 알림이 전송되지 않습니다. Wi-Fi에 연결되어 있는 경우 지금 동기화하여 음성사서함을 확인할 수 있습니다."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"새로운 음성 메시지에 관한 알림이 전송되지 않습니다. Wi-Fi에 연결되어 있는 경우 지금 동기화하여 음성사서함을 확인할 수 있습니다."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"새로운 음성사서함에 대한 알림이 전송되지 않습니다. 음성사서함을 동기화하려면 비행기 모드를 사용 중지하세요."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"음성사서함을 확인하려면 모바일 데이터에 연결되어야 합니다."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"음성사서함을 확인하려면 휴대전화가 모바일 데이터에 연결되어야 합니다."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"시각적 음성사서함을 활성화할 수 없음"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"여전히 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"시각적 음성사서함을 업데이트할 수 없음"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fi 또는 모바일 데이터 연결이 개선되면 다시 시도해 주세요. 여전히 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"모바일 데이터 연결이 개선되면 다시 시도해 주세요. 여전히 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Wi-Fi 또는 모바일 데이터 연결이 개선되면 다시 시도해 주세요. 지금도 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"모바일 데이터 연결이 개선되면 다시 시도해 주세요. 지금도 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"시각적 음성사서함을 업데이트할 수 없음"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"여전히 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"시각적 음성사서함을 업데이트할 수 없음"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"문제 발생"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"고객 서비스 담당자(<xliff:g id="NUMBER">%1$s</xliff:g>)에게 문의하고 오류 코드가 9999임을 알려주시기 바랍니다."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"시각적 음성사서함 이용약관"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"시각적 음성사서함을 사용하려면 Verizon Wireless의 이용약관을 수락해야 합니다.\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVerizon Wireless의 이용약관에 동의한 후 시각적 음성사서함을 사용할 수 있습니다:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"시각적 음성사서함 사용"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"이용약관을 거부하는 경우 시각적 음성사서함이 사용 중지됩니다."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"시각적 음성사서함 사용 중지"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"이용약관을 거부하면 음성사서함 텍스트 변환은 사용 중지됩니다."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"음성사서함 텍스트 변환 사용 중지"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"음성사서함은 *86번으로 통화해야만 액세스가 가능합니다. 계속하려면 새 음성사서함 PIN을 설정하세요."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN 설정"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml
index 0fffb06..d976cb2 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Визуалдык үн почтасын иштетүү"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Визуалдык үн почтасы толук иштетилмейинче үн почтасынын эскертмелерин ала албайсыз. Үн почтасы толугу менен иштетилгенче жаңы билдирүүлөрдү алуу үчүн үн почтасына чалыңыз."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Визуалдык үн почтасы иштебей жатат"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Телефонуңузда мобилдик байланыш бар экенин текшерип, кайра аракет кылыңыз."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Телефонуңузда мобилдик байланыш бар экенин текшерип, кайра аракет кылыңыз."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Учак режимин өчүрүп, кайра аракет кылыңыз."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Байланыш жок"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Жаңы билдирүүлөр жөнүндө эскертмелер келбейт. Эгер телефонуңуз Wi-Fi тармагына туташып турса, аны үн почтасы менен шайкештириңиз."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Жаңы билдирүүлөр жөнүндө эскертмелер келбейт. Эгер телефонуңуз Wi-Fi тармагына туташып турса, аны үн почтасы менен шайкештириңиз."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Жаңы билдирүүлөр жөнүндө эскертмелер келбейт. Учак режимин өчүрүп, телефонуңузду үн почтаңыз менен шайкештириңиз."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Үн почтаңызды текшерүү үчүн мобилдик интернетти иштетиңиз."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Үн почтаңызды текшерүү үчүн мобилдик интернетти иштетиңиз."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Визуалдык үн почтасы иштебей жатат"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Үн почтасын текшерүү үчүн атайын номерге чалсаңыз болот."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Визуалдык үн почтасы жаңырбай жатат"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fi сигналы же мобилдик интернет туруктуу болгончо күтө туруп, анан кайра аракет кылыңыз. Эгер почтаны азыр текшергиңиз келсе, атайын номерге чалыңыз."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Мобилдик интернет туруктуу болгончо күтө туруп, анан кайра аракет кылыңыз. Эгер почтаны азыр текшергиңиз келсе, атайын номерге чалыңыз."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Wi-Fi сигналы же мобилдик интернет туруктуу болгончо күтө туруп, анан кайра аракет кылыңыз. Эгер почтаны азыр текшергиңиз келсе, атайын номерге чалыңыз."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Мобилдик интернет туруктуу болгончо күтө туруп, анан кайра аракет кылыңыз. Эгер почтаны азыр текшергиңиз келсе, атайын номерге чалыңыз."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Визуалдык үн почтасы жаңырбай жатат"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Үн почтасын текшерүү үчүн атайын номерге чалсаңыз болот."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Визуалдык үн почтасы жаңырбай жатат"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Бир жерден ката кетти"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Кардарларды колдоо кызматынын <xliff:g id="NUMBER">%1$s</xliff:g> номерине чалып, ката коду 9999 деп айтыңыз."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Визуалдык үн почтасынын колдонуу жоболору жана шарттары"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Сиз Verizon Wireless\'тин визуалдык үн почтасын колдонуу жоболору менен шарттарына макул болушуңуз керек:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nСиз Verizon Wireless\'тин визуалдык үн почтасын колдонуу жоболору менен шарттарына макул болушуңуз керек:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Визуалдык үн почтасын күйгүзүңүз"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Эгер колдонуу жоболору менен шарттары четке кагылган болсо, визуалдык үн почтасы өчүрүлөт."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Визуалдык үн почтасын өчүрүү"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Эгер колдонуу жоболору менен шарттары четке кагылган болсо, үн почтасы өчүрүлөт."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Үн почтасынын транскрипциясын өчүрүңүз"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Үн почтасын угуу үчүн *86 номерине чалыңыз. Улантуу үчүн, үн почтасына жаңы PIN-кодду коюңуз."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN-код коюу"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml
index d6293d2..baa1a8e 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ກຳລັງເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ບໍ່ສາມາດເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບໄດ້"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ໃຫ້ກວດສອບເບິ່ງວ່າໂທລະສັບຂອງທ່ານເຊື່ອມຕໍ່ເຄືອຂ່າຍມືຖືແລ້ວ ຈາກນັ້ນລອງໃໝ່ອີກຄັ້ງ."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ໃຫ້ກວດສອບວ່າໂທລະສັບຂອງທ່ານມີການເຊື່ອມຕໍ່ອິນເຕີເນັດ ແລ້ວລອງໃໝ່ອີກຄັ້ງ"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ປິດໂໝດຢູ່ໃນຍົນແລ້ວລອງໃໝ່ອີກຄັ້ງ."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ບໍ່ມີການເຊື່ອມຕໍ່"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນເມື່ອມີຂໍ້ຄວາມສຽງໃໝ່. ຫາກທ່ານໃຊ້ Wi-Fi, ທ່ານສາມາດກວດສອບຂໍ້ຄວາມສຽງໄດ້ໂດຍການຊິ້ງຂໍ້ມູນຕອນນີ້."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນເມື່ອມີຂໍ້ຄວາມສຽງໃໝ່. ຫາກທ່ານໃຊ້ Wi-Fi, ທ່ານສາມາດກວດສອບຂໍ້ຄວາມສຽງໄດ້ໂດຍການຊິ້ງຂໍ້ມູນຕອນນີ້."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນເມື່ອມີຂໍ້ຄວາມສຽງໃໝ່. ກະລຸນາປິດໂໝດຢູ່ໃນຍົນເພື່ອຊິ້ງຂໍ້ຄວາມສຽງຂອງທ່ານ."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ໂທລະສັບຂອງທ່ານຕ້ອງມີການເຊື່ອມຕໍ່ເຄືອຂ່າຍມືຖືເພື່ອກວດສອບຂໍ້ຄວາມສຽງ."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ໂທລະສັບຂອງທ່ານຕ້ອງມີການເຊື່ອມຕໍ່ອິນເຕີເນັດມືຖືເພື່ອກວດສອບຂໍ້ຄວາມສຽງ."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ບໍ່ສາມາດເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບໄດ້"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ທ່ານສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງໄດ້ຢູ່."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ໃຫ້ລອງອີກຄັ້ງເມື່ອການເຊື່ອມຕໍ່ Wi-Fi ຫຼື ເຄືອຂ່າຍມືຖືຂອງທ່ານດີຂຶ້ນ. ທ່ານຍັງຄົງສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້ຢູ່."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ໃຫ້ລອງອີກຄັ້ງເມື່ອການເຊື່ອມຕໍ່ເຄືອຂ່າຍມືຖືຂອງທ່ານດີຂຶ້ນ. ທ່ານຍັງຄົງສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້ຢູ່."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ໃຫ້ລອງໃໝ່ອີກຄັ້ງເມື່ອການເຊື່ອມຕໍ່ Wi‑Fi ຫຼື ອິນເຕີເນັດມືຖືຂອງທ່ານໄວຂຶ້ນກວ່ານີ້. ທ່ານຍັງຄົງສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້ຢູ່."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ໃຫ້ລອງອີກຄັ້ງເມື່ອການເຊື່ອມຕໍ່ອິນຕີເນັດມືຖືຂອງທ່ານໄວຂຶ້ນກວ່ານີ້. ທ່ານຍັງຄົງສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້ຢູ່."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ທ່ານສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງໄດ້ຢູ່."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"ມີບາງສິ່ງຜິດປົກກະຕິເກີດຂຶ້ນ"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Please contact Customer Service at <xliff:g id="NUMBER">%1$s</xliff:g> and tell them the error code is 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂຂໍ້ຄວາມສຽງສະເໝືອນ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ທ່ານຕ້ອງຍອມຮັບຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂຂອງ Verizon Wireless ເພື່ອໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nທ່ານຈະຕ້ອງຍອມຮັບຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂຂອງ Verizon Wireless ກ່ອນເພື່ອໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"ຂໍ້ຄວາມສຽງສະເໝືອນຈະຖືກປິດການນຳໃຊ້ຫາກປະຕິເສດຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂດັ່ງກ່າວ."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ປິດການນຳໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"ການຖອດຂໍ້ຄວາມສຽງຈະຖືກປິດການນຳໃຊ້ຫາກປະຕິເສດຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂ."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ປິດການນຳໃຊ້ການຖອດຂໍ້ຄວາມສຽງ"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"ຂໍ້ຄວາມສຽງສາມາດເຂົ້າເຖິງໄດ້ສະເພາະການໂທຜ່ານ *86 ເທົ່ານັ້ນ. ຕັ້ງລະຫັດ PIN ຂໍ້ຄວາມສຽງໃໝ່ເພື່ອດຳເນີນການຕໍ່."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"ຕັ້ງລະຫັດ PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml
index 92f3316..08ba359 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Suaktyvinamas vaizdinis balso paštas"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Kol vaizdinis balso paštas nebus visiškai suaktyvintas, galite negauti balso pašto pranešimų. Jei norite gauti naujus pranešimus, kol jis nėra visiškai suaktyvintas, paskambinkite į balso paštą."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nepavyksta suaktyvinti vaizdinio balso pašto"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Įsitikinkite, kad telefone veikia korinis ryšys, ir bandykite dar kartą."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Įsitikinkite, kad telefone veikia mobilusis ryšys, ir bandykite dar kartą."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Išjunkite lėktuvo režimą ir bandykite dar kartą."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nėra ryšio"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Jums nebus pranešta apie naujus balso pašto pranešimus. Jei esate prisijungę prie „Wi-Fi“, dabar įjungę sinchronizavimą galite patikrinti, ar yra naujų balso pašto pranešimų."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Jums nebus pranešta apie naujus balso pašto pranešimus. Jei esate prisijungę prie „Wi-Fi“, dabar įjungę sinchronizavimą galite patikrinti, ar yra balso pašto pranešimų."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Jums nebus pranešta apie naujus balso pašto pranešimus. Išjunkite lėktuvo režimą, kad galėtumėte sinchronizuoti balso pašto pranešimus."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"kad galėtumėte patikrinti balso pašto pranešimus, telefone turi būti įjungti mobiliojo ryšio duomenys."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Kad galėtumėte patikrinti balso pašto pranešimus, telefone turi būti įjungti mobiliojo ryšio duomenys."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nepavyksta suaktyvinti vaizdinio balso pašto"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Vis tiek galite skambinti ir tikrinti balso pašto pranešimus."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nepavyksta atnaujinti vaizdinio balso pašto"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Bandykite dar kartą, kai „Wi-Fi“ arba mobiliųjų duomenų ryšys bus geresnis. Vis tiek galite skambinti ir tikrinti balso pašto pranešimus."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Bandykite dar kartą, kai mobiliųjų duomenų ryšys bus geresnis. Vis tiek galite skambinti ir tikrinti balso pašto pranešimus."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Bandykite dar kartą, kai „Wi-Fi“ arba mobiliųjų duomenų ryšys bus geresnis. Vis tiek galite paskambinti ir patikrinti balso pašto pranešimus."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Bandykite dar kartą, kai mobiliųjų duomenų ryšys bus geresnis. Vis tiek galite paskambinti ir patikrinti balso pašto pranešimus."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nepavyksta atnaujinti vaizdinio balso pašto"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Vis tiek galite skambinti ir tikrinti balso pašto pranešimus."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nepavyksta atnaujinti vaizdinio balso pašto"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Kažkas ne taip"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Susisiekite su klientų aptarnavimo tarnyba numeriu <xliff:g id="NUMBER">%1$s</xliff:g> ir pasakykite klaidos kodą 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vaizdinio balso pašto taisyklės ir nuostatos"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Norėdami naudoti vaizdinį balso paštą, turite sutikti su „Verizon Wireless“ taisyklėmis ir nuostatomis:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nTurite sutikti su „Verizon Wireless“ taisyklėmis ir nuostatomis, kad galėtumėte naudoti vaizdinį balso paštą:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Vaizdinio balso pašto įjungimas"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Atmetus taisykles ir nuostatas, vaizdinis balso paštas bus išjungtas."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Išjungti vaizdinį balso paštą"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Atmetus taisykles ir nuostatas, balso pašto transkribavimas bus išjungtas."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Išjungti balso pašto transkribavimą"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Balso paštas bus pasiekiamas tik paskambinus numeriu *86. Nustatykite naują balso pašto PIN kodą, kad galėtumėte tęsti."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN kodo nustatymas"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml
index e27de6f..e5d0d80 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Vizuālā balss pasta aktivizēšana"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Kamēr vizuālais balss pasts nebūs pilnībā aktivizēts, iespējams, nesaņemsiet balss pasta paziņojumus. Lai izgūtu jaunus ziņojumus, kamēr balss pasts nav pilnībā aktivizēts, zvaniet balss pastam."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nevar aktivizēt vizuālo balss pastu."</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Pārbaudiet, vai tālrunim ir mobilo datu savienojums, un mēģiniet vēlreiz."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Pārbaudiet, vai tālrunim ir mobilo datu savienojums, un mēģiniet vēlreiz."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Izslēdziet lidojuma režīmu un mēģiniet vēlreiz."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nav savienojuma."</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Jums netiks paziņots par jauniem balss pasta ziņojumiem. Ja ir izveidots Wi-Fi savienojums, varat pārbaudīt balss pastu, veicot sinhronizāciju tūlīt."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Jums netiks paziņots par jauniem balss pasta ziņojumiem. Ja ir izveidots Wi-Fi savienojums, varat pārbaudīt balss pastu, tagad veicot sinhronizāciju."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Jums netiks paziņots par jauniem balss pasta ziņojumiem. Lai sinhronizētu balss pastu, izslēdziet lidojuma režīmu."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Lai pārbaudītu balss pastu, tālrunim ir nepieciešams mobilo datu savienojums."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Lai pārbaudītu balss pastu, tālrunim ir nepieciešams mobilo datu savienojums."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nevar aktivizēt vizuālo balss pastu."</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nevar atjaunināt vizuālo balss pastu."</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Mēģiniet vēlreiz, kad būs stiprāks Wi-Fi vai mobilo datu savienojuma signāls. Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Mēģiniet vēlreiz, kad būs stiprāks mobilo datu savienojuma signāls. Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Mēģiniet vēlreiz, kad būs spēcīgāks Wi-Fi vai mobilo datu savienojuma signāls. Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Mēģiniet vēlreiz, kad būs spēcīgāks mobilo datu savienojuma signāls. Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nevar atjaunināt vizuālo balss pastu."</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nevar atjaunināt vizuālo balss pastu."</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Radās problēma"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālāk norādīto tālruņa numuru, un nosauciet kļūdas kodu “9999”: <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vizuālā balss pasta pakalpojumu sniegšanas noteikumi"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Lai izmantotu vizuālo balss pastu, jums ir jāpiekrīt Verizon Wireless pakalpojumu sniegšanas noteikumiem:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nJums ir jāpiekrīt Verizon Wireless pakalpojumu sniegšanas noteikumiem, lai izmantotu vizuālo balss pastu:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ieslēgt vizuālo balss pastu"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ja tiks noraidīti pakalpojumu sniegšanas noteikumi, vizuālais balss pasts tiks atspējots."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Atspējot vizuālo balss pastu"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ja tiks noraidīti pakalpojumu sniegšanas noteikumi, balss pasta transkripcija tiks atspējota."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Atspējot balss pasta transkripciju"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Balss pasts būs pieejams, tikai zvanot uz numuru *86. Lai turpinātu, iestatiet jaunu balss pasta PIN."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN iestatīšana"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml
index 3ff8b87..6ad7e19 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Се активира визуелна говорна пошта"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Може да не добивате известувања за говорна пошта сѐ додека говорната пошта не се активира во целост. Дотогаш, повикувајте ја говорната пошта за преслушување на новите пораки."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Не може да се активира визуелна говорна пошта"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Проверете дали телефонот има мобилна врска и обидете се повторно."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Проверете дали телефонот е поврзан на мобилна мрежа и обидете се повторно."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Исклучете го авионскиот режим и обидете се повторно."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Нема мрежа"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Нема да добивате известувања за нова говорна пошта. Ако сте поврзани на Wi-Fi, може да ја проверите говорната пошта со синхронизирање сега."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Нема да добивате известувања за нови говорни пораки. Ако сте поврзани на Wi-Fi, може да ја проверите говорната пошта со синхронизирање сега."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Нема да добивате известувања за нова говорна пошта. Исклучете го авионскиот режим за синхронизирање на говорната пошта."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"За проверување говорна пошта, телефонот треба да се поврзе на интернет."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"За проверување говорна пошта, телефонот треба да се поврзе на мобилен интернет."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Не може да се активира визуелна говорна пошта"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Сѐ уште може да повикате за да ја проверите говорната пошта"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Не може да се ажурира визуелната говорна пошта"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Обидете се повторно кога Wi-Fi или мобилната врска ќе се подобрат. Сѐ уште може да повикате за да ја проверите говорната пошта."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Обидете се повторно кога ќе се подобри интернет-врската. Сѐ уште може да повикате за да ја проверите говорната пошта."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Обидете се повторно кога Wi-Fi или мобилниот интернет ќе се подобрат. Сѐ уште може да повикате за да ја проверите говорната пошта."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Обидете се повторно кога ќе се подобри мобилниот интернет. Сѐ уште може да повикате за да ја проверите говорната пошта."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Не може да се ажурира визуелната говорна пошта"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Сѐ уште може да повикате за да ја проверите говорната пошта."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Не може да се ажурира визуелната говорна пошта"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Нешто тргна наопаку"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Контактирајте со Грижа за корисници на <xliff:g id="NUMBER">%1$s</xliff:g> и кажете им дека кодот за грешка е 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Одредби и услови на визуелна говорна пошта"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Мора да ги прифатите Одредбите и условите на Verizon Wireless за да користите говорна пошта:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nМора да ги прифатите Одредбите и условите на Verizon Wireless за да користите визуелна говорна пошта:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Вклучи „Визуелна говорна пошта“"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ако ги одбиете Одредбите и условите, визуелната говорна пошта ќе се оневозможи."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Оневозможете визуелна говорна пошта"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ако ги одбиете Одредбите и условите, транскрипцијата на говорната пошта ќе се оневозможи."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Оневозможи транскрипција на говорна пошта"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Говорната пошта ќе биде достапна само со повикување *86. За да продолжите, поставете нов PIN на говорната пошта."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Поставете PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml
index 84d221e..096b929 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"വിഷ്വൽ വോയ്‌സ്മെയിൽ സജീവമാക്കുന്നു"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ പൂർണ്ണമായും സജീവമാകുന്നത് വരെ നിങ്ങൾക്ക് വോയ്‌സ്‌മെയിൽ അറിയിപ്പുകൾ ലഭിക്കാനിടയില്ല. വോയ്‌സ്‌മെയിൽ പൂർണ്ണമായും സജീവമാകുന്നത് വരെ പുതിയ സന്ദേശങ്ങൾ വീണ്ടെടുക്കാൻ വോയ്‌സ്‌മെയിലിലേക്ക് വിളിക്കുക."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജീവമാക്കാനാവുന്നില്ല"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"നിങ്ങളുടെ ഫോണിന് സെല്ലുലാർ കണക്ഷനുണ്ടെന്ന് ഉറപ്പാക്കി, വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"നിങ്ങളുടെ ഫോണിന് മൊബൈൽ നെറ്റ്‌വർക്ക് കണക്ഷനുണ്ടെന്ന് ഉറപ്പാക്കിയശേഷം വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കി, വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"കണക്ഷൻ ഇല്ല"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"പുതിയ വോയ്‌സ്‌മെയിലുകൾ വരുമ്പോൾ നിങ്ങളെ അറിയിക്കില്ല. നിങ്ങൾ Wi-Fi ഉപയോഗിക്കുകയാണെങ്കിൽ, ഇപ്പോൾ സമന്വയിപ്പിക്കുന്നതിലൂടെ വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാനാവും."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"പുതിയ വോയ്‌സ്‌മെയിലുകൾ വരുമ്പോൾ നിങ്ങളെ അറിയിക്കില്ല. നിങ്ങൾ വൈഫൈ ഉപയോഗിക്കുകയാണെങ്കിൽ, ഇപ്പോൾ സമന്വയിപ്പിക്കുന്നതിലൂടെ വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാനാവും."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"പുതിയ വോയ്‌സ്‌മെയിലുകൾ വരുമ്പോൾ നിങ്ങളെ അറിയിക്കില്ല. വോയ്‌സ്‌മെയിൽ സമന്വയിപ്പിക്കാൻ ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ നിങ്ങളുടെ ഫോണിന് ഒരു സെല്ലുലാർ ഡാറ്റ കണക്ഷൻ ആവശ്യമാണ്."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ നിങ്ങളുടെ ഫോണിന് ഒരു മൊബൈൽ ഡാറ്റ കണക്ഷൻ ആവശ്യമാണ്."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജീവമാക്കാനാവുന്നില്ല"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റുചെയ്യാനാകുന്നില്ല"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"നിങ്ങൾക്ക് മെച്ചപ്പെട്ട Wi-Fi അല്ലെങ്കിൽ സെല്ലുലാർ കണക്ഷൻ ലഭിക്കുമ്പോൾ, വീണ്ടും ശ്രമിക്കുക. വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"നിങ്ങൾക്ക് മെച്ചപ്പെട്ട സെല്ലുലാർ ഡാറ്റ കണക്ഷൻ ലഭിക്കുമ്പോൾ വീണ്ടും ശ്രമിക്കുക. വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"നിങ്ങൾക്ക് മെച്ചപ്പെട്ട വൈഫൈ അല്ലെങ്കിൽ മൊബൈൽ ഡാറ്റ കണക്ഷൻ ലഭിക്കുമ്പോൾ, വീണ്ടും ശ്രമിക്കുക. വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"നിങ്ങൾക്ക് മെച്ചപ്പെട്ട മൊബൈൽ ഡാറ്റ കണക്ഷൻ ലഭിക്കുമ്പോൾ വീണ്ടും ശ്രമിക്കുക. വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റുചെയ്യാനാകുന്നില്ല"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റുചെയ്യാനാകുന്നില്ല"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"എന്തോ കുഴപ്പം സംഭവിച്ചു"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"<xliff:g id="NUMBER">%1$s</xliff:g>-ൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9999 ആണെന്ന് പറയുക."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"വിഷ്വൽ വോയ്‌സ് മെയിൽ നിബന്ധനകളും വ്യവസ്ഥകളും"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"വിഷ്വൽ വോയ്‌സ് മെയിൽ ഉപയോഗിക്കാൻ, നിങ്ങൾ Verizon Wireless-ന്റെ നിബന്ധനകളും വ്യവസ്ഥകളും അംഗീകരിക്കേണ്ടതുണ്ട്:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nവിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഉപയോഗിക്കുന്നതിന് നിങ്ങൾ Verizon Wireless-ന്റെ നിബന്ധനകളും വ്യവസ്ഥകളും അംഗീകരിക്കേണ്ടതുണ്ട്:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഓണാക്കുക"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"നിബന്ധനകളും വ്യവസ്ഥകളും നിരസിക്കപ്പെട്ടാൽ വിഷ്വൽ വോയ്‌സ്‌ മെയിൽ പ്രവർത്തനരഹിതമാവും."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"വിഷ്വൽ വോയ്‌സ്‌‌മെയിൽ പ്രവർത്തനരഹിതമാക്കുക"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"നിബന്ധനകളും വ്യവസ്ഥകളും നിരസിക്കപ്പെടുകയാണെങ്കിൽ വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ട്രാൻസ്‌ക്രിപ്‌ഷൻ പ്രവർത്തനരഹിതമാക്കും."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"വോയ്‌സ്‌മെയിൽ ട്രാൻസ്‌ക്രിപ്‌ഷൻ പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*86-ൽ വിളിച്ച്‌ മാത്രമേ വോയ്‌സ്‌മെയിൽ ആക്‌സസ്‌ ചെയ്യാനാവൂ. തുടരാൻ, പുതിയൊരു വോയ്‌സ്‌മെയിൽ പിൻ‌ നമ്പർ‌ സജ്ജമാക്കുക."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"പിൻ സജ്ജമാക്കുക"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml
index 99fc29d..5d0edbb 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Уншиж болох дуут шууданг идэвхжүүлж байна"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Уншиж болох дуут шууданг бүрэн идэвхжүүлэхээс өмнө танд дуут шуудангийн мэдэгдэл ирэхгүй байж магадгүй. Дуут шууданг бүрэн идэвхжих хүртэл шинэ зурвас авахын тулд дуут шуудан руу залгана уу."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Уншиж болох дуут шууданг идэвхжүүлэх боломжгүй"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Утасны үүрэн холболт байгаа эсэхийг шалгаад дахин оролдоно уу."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Утасны мобайл холболт байгаа эсэхийг шалгаад дахин оролдоно уу."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Нислэгийн горимыг идэвхгүй болгоод дахин оролдоно уу."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Холболт байхгүй"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Шинэ дуут шуудангийн талаар танд мэдэгдэхгүй. Хэрэв та Wi-Fi дээр байвал одоо синк хийж дуут шуудангаа шалгана уу."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Шинэ дуут шуудангийн талаар танд мэдэгдэхгүй. Хэрэв та Wi-Fi-тай холбогдсон бол одоо синк хийж дуут шуудангаа шалгана уу."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Шинэ дуут шуудангийн талаар танд мэдэгдэхгүй. Дуут шуудангаа синк хийхийн тулд нислэгийн горимыг идэвхгүй болгоно уу."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Дуут шууданг шалгахын тулд таны утсанд үүрэн датаны холболт шаардлагатай."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Дуут шууданг шалгахын тулд таны утсанд мобайл датаны холболт шаардлагатай."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Уншиж болох дуут шууданг идэвхжүүлэх боломжгүй"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Та дуут шууданг дуудлага хийж сонсох боломжтой хэвээр байна."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Уншиж болох дуут шууданг шинэчлэх боломжгүй"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Та Wi-Fi дээр байх буюу үүрэн холболт илүү сайн үед дахин оролдоно уу. Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Таны үүрэн датаны холболт илүү сайн үед дахин оролдоно уу. Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Та Wi-Fi эсвэл мобайл холболт илүү сайн үед дахин оролдоно уу. Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Таны мобайл датаны холболт илүү сайн үед дахин оролдоно уу. Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Уншиж болох дуут шууданг шинэчлэх боломжгүй"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Уншиж болох дуут шууданг шинэчлэх боломжгүй"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ямар нэг алдаа гарлаа"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Хэрэглэгчийн үйлчилгээ <xliff:g id="NUMBER">%1$s</xliff:g> руу залгаж алдааны код 9999 гэж хэлнэ үү."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Уншиж болохуйц дуут шуудангийн нөхцөл"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Та уншиж болох дуут шууданг ашиглахын тулд Verizon Wireless-н нөхцөлийг зөвшөөрөх шаардлагатай:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nТа уншиж болох дуут шууданг ашиглахын тулд Verizon Wireless-н нөхцөлийг зөвшөөрөх шаардлагатай:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Уншиж болох дуут шууданг идэвхжүүлэх"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Нөхцөлийг зөвшөөрөхгүй бол уншиж болохуйц дуут шууданг идэвхгүй болгоно."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Уншиж болохуйц дуут шууданг идэвхгүй болгох"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Нөхцөлийг зөвшөөрөхгүй бол дуут шуудан сийрүүлэхийг идэвхгүй болгоно."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Дуут шуудан сийрүүлэхийг идэвхгүй болгох"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Дуут шууданд зөвхөн *86 руу залгаж хандах боломжтой. Үргэлжлүүлэхийн тулд шинэ дуут шуудангийн PIN тохируулна уу."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN тохируулах"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml
index 43c8bdd..b5c39e9 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"दृश्‍यमान व्हॉइसमेल सक्रिय करीत आहे"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"व्हिज्युअल व्हॉइसमेल पूर्णपणे सक्रिय होईपर्यंत आपल्याला व्हॉइसमेल सूचना प्राप्त होऊ शकत नाहीत. व्हॉइसमेल पूर्णपणे सक्रिय होईपर्यंत नवीन संदेश पुनर्प्राप्त करण्यासाठी व्हॉइसमेल बोलवा."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"दृश्‍यमान व्हॉइसमेल सक्रिय करू शकत नाही"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"आपल्‍या फोनवर सेल्युलर कनेक्‍शन असल्याची खात्री करा आणि पुन्हा प्रयत्न करा."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"आपल्या फोनमध्‍ये मोबाइल नेटवर्क कनेक्शन आहे याची खात्री करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"विमान मोड बंद करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"कोणतेही कनेक्शन नाही"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"आपल्याला नवीन व्हॉइसमेलसाठी सूचित केले जाणार नाही. आपण वाय-फाय वर असल्यास आपण आता संकालित करून व्हॉइसमेलसाठी तपासू शकता."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"आपल्याला नवीन व्हॉइसमेलसाठी सूचित केले जाणार नाही. आपण वाय-फाय वर असल्यास, आपण आता संकालित करून व्हॉइसमेल तपासू शकता."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"आपल्याला नवीन व्हॉइसमेलसाठी सूचित केले जाणार नाही. आपला व्हॉइसमेल संकालित करण्यासाठी विमान मोड बंद करा."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"व्हॉइसमेल तपासण्यासाठी आपल्या फोनला सेल्युलर डेटा कनेक्शनची आवश्यकता आहे."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"व्हॉइसमेल तपासण्यासाठी आपल्या फोनसाठी मोबाइल डेटा कनेक्शनची आवश्यकता आहे."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"दृश्‍यमान व्हॉइसमेल सक्रिय करू शकत नाही"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"आपण व्हॉइसमेल तपासण्यासाठी अद्याप कॉल करू शकता."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"दृश्यमान व्हॉइसमेल अद्यतनित करू शकत नाही"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"आपले वाय-फाय किंवा सेल्युलर कनेक्शन चांगले असताना पुन्हा प्रयत्न करा. आपण अद्याप व्हॉइसमेल तपासण्यासाठी कॉल करू शकता."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"आपले सेल्युलर डेटा कनेक्शन चांगले असताना पुन्हा प्रयत्न करा. आपण अद्याप व्हॉइसमेल तपासण्यासाठी कॉल करू शकता."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"आपले वाय‑फाय किंवा मोबाइल डेटा कनेक्शन चांगले असताना पुन्हा प्रयत्न करा. आपण व्हॉइसमेल तपासण्‍यासाठी अद्याप कॉल करू शकता."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"आपले मोबाइल डेटा कनेक्शन चांगले असताना पुन्हा प्रयत्न करा. आपण  व्हॉइसमेल तपासण्यासाठी अद्याप कॉल करू शकता."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"दृश्यमान व्हॉइसमेल अद्यतनित करू शकत नाही"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"आपण व्हॉइसमेल तपासण्यासाठी अद्याप कॉल करू शकता."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"दृश्यमान व्हॉइसमेल अद्यतनित करू शकत नाही"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"काहीतरी चूक झाली."</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"ग्राहक सेवा संपर्काशी <xliff:g id="NUMBER">%1$s</xliff:g> येथे संपर्क साधाा आणि त्यांना त्रुटी कोड 9999 सांगा."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"व्हिज्युअल व्हॉइसमेल अटी आणि नियम"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"आपण व्हिज्युअल व्हॉइसमेल वापरण्यासाठी Verizon वायरलेसच्या अटी आणि नियम स्वीकारणे आवश्यक आहे: \n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nव्हिज्युअल व्हॉइसेमल वापरण्‍यासाठी आपण Verizon Wireless च्या अटी आणि नियम स्वीकारणे  आवश्‍यक आहे:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"व्हिज्युअल व्हॉइसमेल चालू करा"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"अटी आणि नियम नाकारल्या गेल्यास व्हिज्युअल व्हॉइसमेल अक्षम केले जाईल."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"व्हिज्युअल व्हॉइसमेल अक्षम करा"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"अटी आणि नियम नाकारल्यास व्हॉइसमेल प्रतिलेखन अक्षम केले जाईल."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"व्हॉइसमेल प्रतिलेखन अक्षम करा"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"व्हॉइसमेल केवळ *86 वर कॉल करून प्रवेश करण्यायोग्य असेल. सुरू ठेवण्यासाठी नवीन व्हॉइसमेल पिन सेट करा."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"पिन सेट करा"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml
index c8b70d5..210e478 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Mengaktifkan mel suara visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Anda mungkin tidak menerima pemberitahuan mel suara sehingga mel suara visual diaktifkan sepenuhnya. Panggil mel suara untuk mengambil mesej baharu sehingga mel suara diaktifkan sepenuhnya."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Tidak dapat mengaktifkan mel suara visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Pastikan telefon anda mempunyai sambungan selular, kemudian cuba lagi."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Pastikan telefon anda mempunyai sambungan rangkaian mudah alih, kemudian cuba lagi."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Matikan mod pesawat, kemudian cuba lagi."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Tiada sambungan"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Anda tidak akan dimaklumkan tentang mel suara baharu. Jika anda menggunakan Wi-Fi, anda boleh menyemak mel suara dengan menyegerak sekarang."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Anda tidak akan dimaklumi tentang mel suara baharu. Jika anda menggunakan Wi-Fi, anda boleh menyemak mel suara dengan menyegerak sekarang."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Anda tidak akan diberitahu tentang mel suara baharu. Matikan mod pesawat untuk menyegerakkan mel suara anda."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefon anda memerlukan sambungan data selular untuk menyemak mel suara."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefon anda memerlukan sambungan data mudah alih untuk menyemak mel suara."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Tidak dapat mengaktifkan mel suara visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Tidak dapat mengemas kini mel suara visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Cuba lagi apabila sambungan Wi-Fi atau selular anda lebih bagus. Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Cuba lagi apabila sambungan data selular anda lebih bagus. Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Cuba lagi apabila sambungan Wi-Fi atau data mudah alih anda lebih bagus. Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Cuba lagi apabila sambungan data mudah alih anda lebih bagus. Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Tidak dapat mengemas kini mel suara visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Tidak dapat mengemas kini mel suara visual"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Berlaku Kesilapan"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Sila hubungi Khidmat Pelanggan melalui <xliff:g id="NUMBER">%1$s</xliff:g> dan beritahu mereka kod ralatnya ialah 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Terma dan Syarat Mel Suara Visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Anda mesti menerima terma dan syarat Verizon Wireless untuk menggunakan mel suara visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nAnda mesti menerima terma dan syarat Verizon Wireless untuk menggunakan mel suara:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Hidupkan Mel Suara Visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Mel suara visual akan dilumpuhkan jika terma dan syarat ditolak."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Lumpuhkan mel suara visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripsi mel suara akan dilumpuhkan jika terma dan syarat ditolak."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Lumpuhkan transkripsi mel suara"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Mel suara hanya dapat diakses dengan memanggil *86. Tetapkan PIN mel suara baharu untuk meneruskan."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Tetapkan PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml
index 686d37d..7f10cb2 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"မြင်နိုင်သောအသံမေးလ်ကို ဖွင့်နေသည်"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"မြင်ရသောအသံမေးလ်ကို အပြည့်အဝစမဖွင့်သရွေ့ အသံမေးလ်အကြောင်းကြားချက်များကို လက်ခံရရှိနိုင်မည်မဟုတ်ပါ။ အသံမေးလ်ကို အပြည့်အဝစဖွင့်မပြီးမချင်း မက်ဆေ့ဂျ်အသစ်များရယူရန် အသံမေးလ်ခေါ်ဆိုပါ။"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"မြင်ရသောအသံမေးလ်ကို ဖွင့်၍မရပါ"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"သင့်ဖုန်းတွင် ဆယ်လူလာချိတ်ဆက်မှုရှိကြောင်း စစ်ဆေး၍ ထပ်စမ်းကြည့်ပါ။"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"သင့်ဖုန်းတွင် မိုဘိုင်းကွန်ရက် ချိတ်ဆက်မှုရှိကြောင်း စစ်ဆေး၍ ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"လေယာဉ်ပျံမုဒ်ပိတ်၍ ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ချိတ်ဆက်မှုမရှိပါ"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"အသံမေးလ်အသစ်များအတွက် သင့်ကို အကြောင်းကြားလိမ့်မည်မဟုတ်ပါ။ Wi-Fi သုံးနေပါက ယခုပင် ပြိုင်တူညှိခြင်းဖြင့် အသံမေးလ်ကို စစ်ဆေးနိုင်ပါသည်။"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"အသံမေးလ်အသစ်များအတွက် သင့်ကို အကြောင်းကြားလိမ့်မည်မဟုတ်ပါ။ Wi-Fi သုံးနေပါက ယခုပင် စင့်ခ်လုပ်ခြင်းဖြင့် အသံမေးလ်ကို စစ်ဆေးနိုင်ပါသည်။"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"အသံမေးလ်အသစ်များအတွက် သင့်ကို အကြောင်းကြားလိမ့်မည်မဟုတ်ပါ။ သင့်အသံမေးလ်ပြိုင်တူညှိရန် လေယာဉ်ပျံမုဒ်ပိတ်ပါ။"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"အသံမေးလ်စစ်ရန်အတွက် သင့်ဖုန်းတွင် ဆယ်လူလာဒေတာချိတ်ဆက်မှုတစ်ခု လိုပါသည်။"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"အသံမေးလ်စစ်ရန်အတွက် သင့်ဖုန်းတွင် မိုဘိုင်းဒေတာချိတ်ဆက်မှုတစ်ခု လိုပါသည်။"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"မြင်ရသောအသံမေးလ် ဖွင့်၍မရပါ"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"မြင်ရသောအသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"သင်၏ Wi-Fi (သို့) ဆယ်လူလာချိတ်ဆက်မှု လိုင်းပိုကောင်းမှ ထပ်စမ်းကြည့်ပါ။ အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"သင်၏ဆယ်လူလာချိတ်ဆက်မှု လိုင်းပိုကောင်းမှ ထပ်စမ်းကြည့်ပါ။ အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"သင်၏ Wi-Fi (သို့) မိုဘိုင်းဒေတာချိတ်ဆက်မှု လိုင်းပိုကောင်းမှ ထပ်စမ်းကြည့်ပါ။ အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"သင်၏ မိုဘိုင်းဒေတာ ချိတ်ဆက်မှု လိုင်းပိုကောင်းမှ ထပ်စမ်းကြည့်ပါ။ အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"မြင်ရသောအသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"မြင်ရသောအသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"တစ်စုံတစ်ခု လွဲချော်နေပါသည်"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"သုံးစွဲသူဝန်ဆောင်ရေးကို <xliff:g id="NUMBER">%1$s</xliff:g> တွင် ဆက်သွယ်ပြီး အမှားအယွင်းကုဒ်သည် ၉၉၉၉ ဖြစ်ကြောင်း ပြောပါ။"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"မြင်နိုင်သောအသံမေးလ် ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"သင်သည် မြင်နိုင်သောအသံမေးလ်ကို အသုံးပြုရန် Verizon Wireless ၏ ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများကို လက်ခံရပါမည် - \n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nစာသားမှတ်တမ်းပါ အသံမေးလ်ကို အသုံးပြုရန် Verizon ကြိုးမဲ့စနစ်၏ ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများကို လက်ခံရပါမည် - \n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"စာသားမှတ်တမ်းပါ အသံမေးလ်ဖွင့်ခြင်း"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများကို ငြင်းပယ်ပါက မြင်နိုင်သောအသံမေးလ်ကို ပိတ်ပစ်ပါလိမ့်မည်။"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"မြင်နိုင်သောအသံမေးလ် ပိတ်ပါ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများကို ငြင်းပယ်ပါက အသံမေးလ် စာသားမှတ်တမ်းများကို ပိတ်ပစ်ပါလိမ့်မည်။"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"အသံမေးလ် စာသားမှတ်တမ်းကို ပိတ်ရန်"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*၈၆ သို့ ခေါ်ဆိုခြင်းဖြင့်သာ အသံမေးလ်ကို ဝင်သုံးနိုင်ပါမည်။ ဆက်သွားရန် အသံမေးလ်ပင်နံပါတ်အသစ်ကို သတ်မှတ်ပါ။"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"ပင်နံပါတ်ကို သတ်မှတ်ပါ"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml
index 6fc7561..9e64ee7 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Slår på visuell talepostkasse"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Det er ikke sikert at du kan motta talepostvarsler før visuell talepost er fullt aktivert. Ring talepost for å hente nye meldinger før aktiveringen er fullført."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Kan ikke slå på visuell talepost"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Sjekk at telefonen din har mobilforbindelse og prøv igjen."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Sjekk at telefonen din har mobilforbindelse, og prøv på nytt."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Slå av flymodus og prøv igjen."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ingen tilkobling"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Du blir ikke varslet om nye talemeldinger. Hvis du er på Wi-Fi, kan du sjekke taleposten ved å synkronisere nå."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Du blir ikke varslet om nye talemeldinger. Hvis du er på Wi-Fi, kan du sjekke taleposten ved å synkronisere nå."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Du blir ikke varslet om nye talemeldinger. Slå av flymodus for å synkronisere talepost."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefonen din trenger mobildatatilkobling for å kunne sjekke talepost."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefonen må ha mobildataforbindelse for at du skal kunne sjekke talepost."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Kan ikke slå på visuell talepost"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Kan ikke oppdatere visuell talepost"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Prøv igjen når Wi-Fi- eller mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Prøv igjen når mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Prøv på nytt når Wi‑Fi- eller mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Prøv igjen når mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Kan ikke oppdatere visuell talepost"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Kan ikke oppdatere visuell talepost"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Noe gikk galt"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontakt kundeservice på <xliff:g id="NUMBER">%1$s</xliff:g> og referer til feilkode 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vilkår for visuell talepost"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Du må godta vilkårene til Verizon Wireless før du kan ta i bruk visuell talepost:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDu må godta Verizon Wireless sine vilkår for å kunne bruke visuell talepost:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Slå på visuell talepost"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuell talepost blir slått av hvis vilkårene ikke godtas."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Slå av visuell talepost"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripsjon av talepost blir slått av hvis vilkårene blir avvist."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Slå av transkripsjon av talepost"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Talemeldinger er bare tilgjengelig ved å ringe *86. Angi en ny PIN-kode for å fortsette."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Angi PIN-kode"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml
index ff06fa0..08741f2 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"भिजुअल भ्वाइसमेललाई सक्रिय पार्दै"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"भिजुअल भ्वाइसमेल पूर्णतया सक्रिय नभएसम्म तपाईँलाई भ्वाइसमेलका सूचनाहरू प्राप्त नहुन सक्छन्। भ्वाइसमेल पूर्णतया सक्रिय नहुन्जेल नयाँ सन्देशहरू प्राप्त गर्न भ्वाइसमेल सेवामा कल गर्नुहोस्।"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"भिजुअल भ्वाइस मेललाई सक्रिय पार्न सकिँदैन"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"आफ्नो फोन सेलुलरमा जडान भएको छ भन्ने निश्चित गर्नुहोस् र फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"आफ्नो फोन मोबाइल नेटवर्कमा जडान भएको छ भन्ने निश्चित गर्नुहोस् र फेरि प्रयास गर्नुहोस्।"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"हवाइजहाज मोड बन्द गर्नुहोस् र फेरि प्रयास गर्नुहोस्।"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"जडान छैन"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"तपाईंलाई नयाँ भ्वाइस मेल सम्बन्धी सूचना दिइने छैन। तपाईं Wi-Fi चलाउँदै हुनुहुन्छ भने, अब सिङ्क गरी भ्वाइस मेल जाँच गर्न सक्नुहुन्छ।"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"तपाईंलाई नयाँ भ्वाइस मेल सम्बन्धी सूचना दिइने छैन। तपाईं Wi-Fi चलाउँदै हुनुहुन्छ भने, अब सिङ्क गरी भ्वाइस मेल जाँच गर्न सक्नुहुन्छ।"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"तपाईंलाई नयाँ भ्वाइस मेल सम्बन्धी सूचना दिइने छैन। आफ्नो भ्वाइस मेल सिङ्क गर्न हवाइजहाज मोड बन्द गर्नुहोस्।"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"भ्वाइस मेल जाँच गर्न तपाईंको फोन सेलुलर डेटामा जडान हुनु आवश्यक हुन्छ।"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"भ्वाइस मेल जाँच गर्न तपाईंको फोन मोबाइल डेटामा जडान हुनु आवश्यक हुन्छ।"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"भिजुअल भ्वाइस मेललाई सक्रिय गर्न सकिँदैन"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"तपाईं अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिँदैन"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"तपाईंको Wi-Fi वा सेलुलर जडान राम्रो भएका बेला पुन: प्रयास गर्नुहोस्। तपाईं अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"तपाईंको Wi-Fi वा सेलुलर जडान अझ राम्रो भएका बेला पुन: प्रयास गर्नुहोस्। तपाईं अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"तपाईंको Wi-Fi वा मोबाइल जडान राम्रो भएका बेला पुन: प्रयास गर्नुहोस्। तपाईंले अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"तपाईंको मोबाइल डेटा जडान अझ राम्रो भएका बेला पुन: प्रयास गर्नुहोस्। तपाईंले अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिँदैन"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"तपाईं अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिँदैन"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"केही गडबड भयो"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"कृपया <xliff:g id="NUMBER">%1$s</xliff:g> मा ग्राहक सेवामा सम्पर्क गर्नुहोस् र तिनीहरूलाई त्रुटिको कोड ९९९९ हो भनी बताउनुहोस्।"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"भिजुअल भ्वाइस मेल सम्बन्धी सेवाका सर्तहरू"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"भिजुअल भ्वाइस मेल प्रयोग गर्नका लागि तपाईंले अनिवार्य रूपले Verizon Wireless का सेवाका सर्तहरू स्वीकार गर्नुपर्छ:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\n भिजुअल भ्वाइस मेल प्रयोग गर्नका लागि तपाईंले अनिवार्य रूपले Verizon Wireless का सेवाका सर्तहरू स्वीकार गर्नुपर्छ:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"भिजुअल भ्वाइस मेल सक्रिय गर्नुहोस्"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"सेवाका सर्तहरू अस्वीकार गरिएमा भिजुअल भ्वाइस मेल असक्षम पारिने छ।"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"भिजुअल भ्वाइस मेल असक्षम पार्नुहोस्"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"सेवाका सर्तहरू अस्वीकार गरिएमा भिजुअल ट्रान्स्क्रिप्सनलाई असक्षम पारिने छ।"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"भ्वाइस मेल ट्रान्स्क्रिप्सन असक्षम पार्नुहोस्"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*८६ मा कल गरेर मात्र भ्वाइस मेलमाथि पहुँच राख्न सकिने छ। अघि बढ्न भ्वाइस मेलको नयाँ PIN सेट गर्नुहोस्।"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN सेट गर्नुहोस्"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml
index f74a37d..a5e7d54 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Visuele voicemail activeren"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Je ontvangt mogelijk geen voicemailmeldingen totdat visuele voicemail volledig is geactiveerd. Bel je voicemail om nieuwe berichten op te halen totdat visuele voicemail volledig is geactiveerd."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Kan visuele voicemail niet activeren"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Zorg dat je telefoon een mobiele verbinding heeft en probeer het opnieuw."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Zorg dat je telefoon een mobiele netwerkverbinding heeft en probeer het opnieuw."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Schakel de vliegtuigmodus uit en probeer het opnieuw."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Geen verbinding"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Je ontvangt geen meldingen voor nieuwe voicemails. Als je wifi gebruikt, kun je je voicemail controleren door nu te synchroniseren."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Je ontvangt geen meldingen voor nieuwe voicemails. Als je wifi gebruikt, kun je je voicemail controleren door nu te synchroniseren."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Je ontvangt geen meldingen voor nieuwe voicemails. Schakel de vliegtuigmodus uit om je voicemail te synchroniseren."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Je telefoon heeft een mobiele dataverbinding nodig om je voicemail te controleren."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Je telefoon heeft een mobiele dataverbinding nodig om je voicemail te controleren."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Kan visuele voicemail niet activeren"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Je kunt nog steeds bellen om je voicemail te controleren."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Kan visuele voicemail niet updaten"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Probeer het opnieuw als er een betere wifi- of mobiele verbinding beschikbaar is. Je kunt nog steeds bellen om je voicemail controleren."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Probeer het opnieuw wanneer er een betere mobiele dataverbinding beschikbaar is. Je kunt nog steeds bellen om je voicemail te controleren."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Probeer het opnieuw als er een betere wifi- of mobiele dataverbinding beschikbaar is. Je kunt nog steeds bellen om je voicemail te controleren."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Probeer het opnieuw wanneer er een betere mobiele dataverbinding beschikbaar is. Je kunt nog steeds bellen om je voicemail te controleren."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Kan visuele voicemail niet updaten"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Je kunt nog steeds bellen om je voicemail te controleren."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Kan visuele voicemail niet updaten"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Er is iets misgegaan"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Neem via <xliff:g id="NUMBER">%1$s</xliff:g> contact op met de klantenservice en geef de foutcode 9999 door."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Algemene voorwaarden voor visuele voicemail"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Je moet de Algemene voorwaarden van Verizon accepteren om visuele voicemail te gebruiken:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nJe moet de Algemene voorwaarden van Verizon Wireless accepteren om visuele voicemail te kunnen gebruiken:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Visuele voicemail inschakelen"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuele voicemail wordt uitgeschakeld als de Algemene voorwaarden worden geweigerd."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Visuele voicemail uitschakelen"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Voicemail-transcriptie wordt uitgeschakeld als de Algemene voorwaarden worden geweigerd."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Voicemail-transcriptie uitschakelen"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Voicemail is alleen toegankelijk door *86 te bellen. Stel een nieuwe pincode voor de voicemail in om door te gaan."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Pincode instellen"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml
index 6fc7561..9e64ee7 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Slår på visuell talepostkasse"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Det er ikke sikert at du kan motta talepostvarsler før visuell talepost er fullt aktivert. Ring talepost for å hente nye meldinger før aktiveringen er fullført."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Kan ikke slå på visuell talepost"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Sjekk at telefonen din har mobilforbindelse og prøv igjen."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Sjekk at telefonen din har mobilforbindelse, og prøv på nytt."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Slå av flymodus og prøv igjen."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ingen tilkobling"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Du blir ikke varslet om nye talemeldinger. Hvis du er på Wi-Fi, kan du sjekke taleposten ved å synkronisere nå."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Du blir ikke varslet om nye talemeldinger. Hvis du er på Wi-Fi, kan du sjekke taleposten ved å synkronisere nå."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Du blir ikke varslet om nye talemeldinger. Slå av flymodus for å synkronisere talepost."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefonen din trenger mobildatatilkobling for å kunne sjekke talepost."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefonen må ha mobildataforbindelse for at du skal kunne sjekke talepost."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Kan ikke slå på visuell talepost"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Kan ikke oppdatere visuell talepost"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Prøv igjen når Wi-Fi- eller mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Prøv igjen når mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Prøv på nytt når Wi‑Fi- eller mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Prøv igjen når mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Kan ikke oppdatere visuell talepost"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Kan ikke oppdatere visuell talepost"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Noe gikk galt"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontakt kundeservice på <xliff:g id="NUMBER">%1$s</xliff:g> og referer til feilkode 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vilkår for visuell talepost"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Du må godta vilkårene til Verizon Wireless før du kan ta i bruk visuell talepost:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDu må godta Verizon Wireless sine vilkår for å kunne bruke visuell talepost:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Slå på visuell talepost"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuell talepost blir slått av hvis vilkårene ikke godtas."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Slå av visuell talepost"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripsjon av talepost blir slått av hvis vilkårene blir avvist."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Slå av transkripsjon av talepost"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Talemeldinger er bare tilgjengelig ved å ringe *86. Angi en ny PIN-kode for å fortsette."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Angi PIN-kode"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml
index 2a07b45..93302b0 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ਜਦੋਂ ਤੱਕ ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਪੂਰੀ ਤਰ੍ਹਾਂ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਹੋ ਜਾਂਦੀ, ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਹਾਨੂੰ ਵੌਇਸਮੇਲ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਾ ਹੋਣ। ਵੌਇਸਮੇਲ ਦੇ ਪੂਰੀ ਤਰ੍ਹਾਂ ਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਤੱਕ ਨਵੇਂ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਵੌਇਸਮੇਲ ਨੂੰ ਕਾਲ ਕਰੋ।"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ ਵਿੱਚ ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨ ਹੈ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਹੈ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ਕੋਈ ਕਨੈਕਸ਼ਨ ਨਹੀਂ"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ਤੁਹਾਨੂੰ ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਲਈ ਸੂਚਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ Wi-Fi \'ਤੇ ਹੋ, ਤਾਂ ਹੁਣੇ ਸਮਕਾਲੀਕਰਨ ਕਰਨ ਦੁਆਰਾ ਵੌਇਸਮੇਲਾਂ ਦੀ ਜਾਂਚ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ਤੁਹਾਨੂੰ ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਲਈ ਸੂਚਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ Wi-Fi \'ਤੇ ਹੋ, ਤਾਂ ਹੁਣੇ ਸਮਕਾਲੀਕਰਨ ਕਰਕੇ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ਤੁਹਾਨੂੰ ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਲਈ ਸੂਚਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। ਆਪਣੀਆਂ ਵੌਇਸਮੇਲਾਂ ਸਮਕਾਲੀਕਿਰਤ ਕਰਨ ਲਈ ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ।"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ਵੌਇਸਮੇਲਾਂ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਇੱਕ ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਇੱਕ ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ਤੁਹਾਡੇ Wi-Fi ਜਾਂ ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨ ਦੇ ਬਿਹਤਰ ਹੋਣ \'ਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ਤੁਹਾਡੇ ਸੈਲਿਊਲਰ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਬਿਹਤਰ ਹੋਣ \'ਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ਤੁਹਾਡੇ Wi-Fi ਜਾਂ ਮੋਬਾਈਲ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਬਿਹਤਰ ਹੋਣ \'ਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਬਿਹਤਰ ਹੋਣ \'ਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"ਕਿਰਪਾ ਕਰਕੇ <xliff:g id="NUMBER">%1$s</xliff:g> \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9999 ਹੈ।"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ਵਿਜੁਅਲ ਵੌਇਸਮੇਲ ਮਦਾਂ ਅਤੇ ਸ਼ਰਤਾਂ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਵਰਤਣ ਲਈ ਤੁਸੀਂ ਲਾਜ਼ਮੀ ਤੌਰ \'ਤੇ Verizon ਵਾਇਰਲੈੱਸ ਦੀਆਂ ਮਦਾਂ ਅਤੇ ਸ਼ਰਤਾਂ ਨੂੰ ਸਵੀਕਾਰ ਕਰੋ:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nਦ੍ਰਿਸ਼ਟਾਂਤਕ ਵੌਇਸਮੇਲ ਨੂੰ ਵਰਤਣ ਲਈ ਤੁਸੀਂ ਲਾਜ਼ਮੀ ਤੌਰ \'ਤੇ Verizon ਵਾਇਰਲੈੱਸ ਦੀਆਂ ਮਦਾਂ ਅਤੇ ਸ਼ਰਤਾਂ ਨੂੰ ਸਵੀਕਾਰ ਕਰੋ:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਵੌਇਸਮੇਲ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਅਯੋਗ ਹੋ ਜਾਵੇਗੀ ਜੇਕਰ ਮਦਾਂ ਅਤੇ ਸ਼ਰਤਾਂ ਨੂੰ ਅਸਵੀਕਾਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਅਯੋਗ ਬਣਾਓ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"ਵੌਇਸਮੇਲ ਪ੍ਰਤਿਲਿਪੀ ਅਯੋਗ ਹੋ ਜਾਵੇਗੀ ਜੇਕਰ ਮਦਾਂ ਅਤੇ ਸ਼ਰਤਾਂ ਨੂੰ ਅਸਵੀਕਾਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ਵੌਇਸਮੇਲ ਪ੍ਰਤਿਲਿਪੀ ਨੂੰ ਅਯੋਗ ਬਣਾਓ"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"ਵੌਇਸਮੇਲ ਸਿਰਫ਼ *86 \'ਤੇ ਕਾਲ ਕਰਨ ਦੁਆਰਾ ਪਹੁੰਚਯੋਗ ਹੋਵੇਗੀ। ਜਾਰੀ ਰੱਖਣ ਲਈ ਇੱਕ ਨਵਾਂ ਵੌਇਸਮੇਲ PIN ਸੈੱਟ ਕਰੋ।"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN ਸੈੱਟ ਕਰੋ"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml
index b122908..18b0902 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktywuję wizualną pocztę głosową"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Powiadomienia poczty głosowej mogą być dostępne dopiero po pełnej aktywacji wizualnej poczty głosowej. Do tego momentu nowe wiadomości możesz pobierać, dzwoniąc na pocztę głosową."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nie udało się aktywować wizualnej poczty głosowej"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Upewnij się, że telefon ma połączenie z internetem, i spróbuj jeszcze raz."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Upewnij się, że telefon ma połączenie z siecią komórkową, i spróbuj jeszcze raz."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Wyłącz tryb samolotowy i spróbuj jeszcze raz."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Brak połączenia"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nie otrzymasz powiadomień o nowych wiadomościach głosowych. Jeśli masz połączenie Wi-Fi, możesz teraz sprawdzić dostępność nowych wiadomości przez zsynchronizowanie urządzenia."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nie otrzymasz powiadomień o nowych wiadomościach głosowych. Jeśli masz połączenie Wi-Fi, możesz teraz sprawdzić dostępność nowych wiadomości przez zsynchronizowanie urządzenia."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nie otrzymasz powiadomień o nowych wiadomościach głosowych. Wyłącz tryb samolotowy, aby zsynchronizować pocztę głosową."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Aby sprawdzić pocztę głosową, telefon musi mieć połączenie z internetem."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Aby sprawdzić pocztę głosową, telefon musi mieć połączenie z internetem."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nie udało się aktywować wizualnej poczty głosowej"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nie udało się zaktualizować wizualnej poczty głosowej"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Spróbuj jeszcze raz, gdy znajdziesz lepszy zasięg sieci komórkowej lub Wi-Fi. Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Spróbuj jeszcze raz, gdy znajdziesz lepszy zasięg sieci komórkowej. Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Spróbuj jeszcze raz, gdy znajdziesz lepszy zasięg sieci komórkowej lub Wi-Fi. Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Spróbuj jeszcze raz, gdy znajdziesz lepszy zasięg sieci komórkowej. Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nie udało się zaktualizować wizualnej poczty głosowej"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nie udało się zaktualizować wizualnej poczty głosowej"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Coś poszło nie tak"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Skontaktuj się z obsługą klienta pod numerem <xliff:g id="NUMBER">%1$s</xliff:g>, podając kod błędu 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Warunki korzystania z wizualnej poczty głosowej"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Aby korzystać z wizualnej poczty głosowej, musisz zaakceptować warunki operatora Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nAby korzystać z wizualnej poczty głosowej, musisz zaakceptować warunki operatora Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Włącz wizualną pocztę głosową"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Jeśli odrzucisz warunki korzystania z usługi, wizualna poczta głosowa zostanie wyłączona."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Wyłącz wizualną pocztę głosową"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Jeśli odrzucisz warunki korzystania z usługi, transkrypcja wiadomości w poczcie głosowej zostanie wyłączona."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Wyłącz transkrypcję wiadomości w poczcie głosowej"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Poczta głosowa będzie dostępna tylko przez połączenie telefoniczne z numerem *86. Ustaw nowy kod PIN poczty głosowej, aby przejść dalej."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Ustaw kod PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml
index bbe9340..ce2b4ee 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ativando correio de voz visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Talvez você não receba notificações do correio de voz até que o correio de voz visual esteja totalmente ativado. Enquanto isso não acontecer, ligue para o correio de voz para receber as novas mensagens."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Não foi possível ativar o correio de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Verifique se seu smartphone tem uma conexão celular e tente novamente."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Verifique se seu smartphone tem uma conexão por rede móvel e tente novamente."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desative o modo avião e tente novamente."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sem conexão"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Você não será notificado sobre novos correios de voz. Se estiver usando Wi-Fi, sincronize agora para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Você não será notificado sobre novos correios de voz. Se estiver usando Wi-Fi, sincronize agora para verificar o correio de voz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Você não será notificado sobre novos correios de voz. Desative o modo avião para sincronizar seu correio de voz."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Seu smartphone precisa de uma conexão de dados da rede celular para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Seu smartphone precisa de uma conexão de dados móveis para verificar o correio de voz."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Não foi possível ativar o correio de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Não foi possível atualizar o correio de voz visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Tente novamente quando estiver com uma conexão celular ou Wi-Fi melhor. Você ainda pode ligar para verificar o correio de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Tente novamente quando estiver com uma conexão de dados da rede celular melhor. Você ainda pode ligar para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Tente novamente quando estiver com uma conexão de dados móveis ou Wi‑Fi melhor. Você ainda pode ligar para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Tente novamente quando estiver com uma conexão de dados móveis melhor. Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Não foi possível atualizar o correio de voz visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Não foi possível atualizar o correio de voz visual"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ocorreu um erro"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Entre em contato com o atendimento ao cliente pelo número <xliff:g id="NUMBER">%1$s</xliff:g> e forneça o código de erro 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termos e Condições do correio de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Você precisa aceitar os termos e condições da Verizon Wireless para usar o correio de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVocê precisa aceitar os Termos e Condições da Verizon Wireless para usar o correio de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ativar correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"O correio de voz visual será desativado se os termos e condições forem recusados."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desativar correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"A transcrição do correio de voz será desativada se os Temos e Condições forem recusados."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desativar transcrição do correio de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"O correio de voz só estará acessível quando você ligar para *86. Defina um novo PIN do correio de voz para continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Definir PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml
index 364b278..3b8ba1b 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"A ativar o correio de voz visual..."</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Poderá não receber notificações de correio de voz até o correio de voz visual estar completamente ativado. Ligue para o correio de voz para obter novas mensagens até o correio de voz estar completamente ativado."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Não é possível ativar o correio de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Certifique-se de que o seu telemóvel tem uma ligação de rede móvel e tente novamente."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Certifique-se de que o seu telemóvel tem uma ligação de rede móvel e tente novamente."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desative o modo de avião e tente novamente."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sem ligação"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Não será notificado quando receber novas mensagens de correio de voz. Se estiver numa ligação Wi-Fi, pode verificar se existem mensagens de correio de voz ao sincronizar agora."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Não será notificado quando receber novas mensagens de correio de voz. Se estiver numa ligação Wi-Fi, pode verificar se existem mensagens de correio de voz ao sincronizar agora."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Não será notificado quando receber novas mensagens de correio de voz. Desative o modo de avião para sincronizar as suas mensagens de correio de voz."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"O seu telemóvel precisa de uma ligação de dados móveis para verificar se existem mensagens de correio de voz."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"O seu telemóvel precisa de uma ligação de dados móveis para verificar se existem mensagens de correio de voz."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Não é possível ativar o correio de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Não é possível atualizar as mensagens de correio de voz visuais"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Tente novamente quando a sua ligação Wi-Fi ou de rede móvel for mais forte. Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Tente novamente quando a sua ligação de rede móvel for mais forte. Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Tente novamente quando a sua ligação Wi-Fi ou de dados móveis for mais forte. Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Tente novamente quando a sua ligação de dados móveis for mais forte. Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Não é possível atualizar as mensagens de correio de voz visuais"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Não é possível atualizar as mensagens de correio de voz visuais"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ocorreu um erro"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Contacte o serviço de apoio ao cliente através do número <xliff:g id="NUMBER">%1$s</xliff:g> e indique que o código de erro é 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termos de Utilização do Correio de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Tem de aceitar os Termos de Utilização da Verizon Wireless para utilizar o correio de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nTem de aceitar os Termos de Utilização da Verizon Wireless para utilizar o correio de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ativar o correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"O correio de voz visual será desativado se tiver recusado os Termos de Utilização."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desativar o correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"A transcrição das mensagens de correio de voz será desativada se tiver recusado os Termos de Utilização."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desativar a transcrição das mensagens de correio de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"O correio de voz está apenas disponível ao ligar para *86. Defina um novo PIN do correio de voz para continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Definir PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml
index bbe9340..ce2b4ee 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ativando correio de voz visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Talvez você não receba notificações do correio de voz até que o correio de voz visual esteja totalmente ativado. Enquanto isso não acontecer, ligue para o correio de voz para receber as novas mensagens."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Não foi possível ativar o correio de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Verifique se seu smartphone tem uma conexão celular e tente novamente."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Verifique se seu smartphone tem uma conexão por rede móvel e tente novamente."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desative o modo avião e tente novamente."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sem conexão"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Você não será notificado sobre novos correios de voz. Se estiver usando Wi-Fi, sincronize agora para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Você não será notificado sobre novos correios de voz. Se estiver usando Wi-Fi, sincronize agora para verificar o correio de voz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Você não será notificado sobre novos correios de voz. Desative o modo avião para sincronizar seu correio de voz."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Seu smartphone precisa de uma conexão de dados da rede celular para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Seu smartphone precisa de uma conexão de dados móveis para verificar o correio de voz."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Não foi possível ativar o correio de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Não foi possível atualizar o correio de voz visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Tente novamente quando estiver com uma conexão celular ou Wi-Fi melhor. Você ainda pode ligar para verificar o correio de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Tente novamente quando estiver com uma conexão de dados da rede celular melhor. Você ainda pode ligar para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Tente novamente quando estiver com uma conexão de dados móveis ou Wi‑Fi melhor. Você ainda pode ligar para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Tente novamente quando estiver com uma conexão de dados móveis melhor. Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Não foi possível atualizar o correio de voz visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Não foi possível atualizar o correio de voz visual"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ocorreu um erro"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Entre em contato com o atendimento ao cliente pelo número <xliff:g id="NUMBER">%1$s</xliff:g> e forneça o código de erro 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termos e Condições do correio de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Você precisa aceitar os termos e condições da Verizon Wireless para usar o correio de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVocê precisa aceitar os Termos e Condições da Verizon Wireless para usar o correio de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ativar correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"O correio de voz visual será desativado se os termos e condições forem recusados."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desativar correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"A transcrição do correio de voz será desativada se os Temos e Condições forem recusados."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desativar transcrição do correio de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"O correio de voz só estará acessível quando você ligar para *86. Defina um novo PIN do correio de voz para continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Definir PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml
index 263ab00..046df48 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Se activează mesageria vocală vizuală"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"E posibil să nu primiți notificări de la mesageria vocală până când mesageria vocală vizuală nu este activată complet. Apelați mesageria vocală pentru a prelua mesajele noi până la activarea completă a mesageriei."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nu se poate activa mesagerie vocală vizuală"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Asigurați-vă că telefonul are conexiune mobilă și încercați din nou."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Asigurați-vă că telefonul are o conexiune la o rețea mobilă și încercați din nou."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Dezactivați modul avion și încercați din nou."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nicio conexiune"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nu veți primi notificări pentru mesaje vocale noi. Dacă folosiți Wi-Fi, puteți verifica mesageria sincronizând acum."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nu veți primi notificări pentru mesaje vocale noi. Dacă folosiți Wi-Fi, puteți verifica mesageria sincronizând acum."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nu veți primi notificări pentru mesajele vocale noi. Dezactivați modul avion pentru a vă sincroniza mesageria."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefonul dvs. are nevoie de conexiune mobilă pentru a verifica mesageria vocală."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefonul dvs. are nevoie de conexiune mobilă pentru a verifica mesageria vocală."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nu se poate activa mesagerie vocală vizuală"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nu se poate actualiza mesageria vocală vizuală"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Încercați din nou când aveți o conexiune Wi-Fi sau mobilă mai bună. Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Încercați din nou când aveți o conexiune mobilă mai bună. Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Încercați din nou când aveți o conexiune Wi-Fi sau mobilă mai bună. Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Încercați din nou când aveți o conexiune mobilă mai bună. Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nu se poate actualiza mesageria vocală vizuală"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nu se poate actualiza mesageria vocală vizuală"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"A apărut o eroare"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Contactați Serviciul de asistență pentru clienți la <xliff:g id="NUMBER">%1$s</xliff:g> și comunicați-le codul erorii: 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termeni și condiții pentru mesageria vocală vizuală"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Trebuie să acceptați termenii și condițiile Verizon Wireless pentru a folosi mesageria vocală vizuală:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nTrebuie să acceptați Termenii și condițiile Verizon Wireless pentru a folosi mesageria vocală vizuală:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activați Mesageria vocală vizuală"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Mesageria vocală vizuală va fi dezactivată dacă nu acceptați termenii și condițiile."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Dezactivați mesageria vocală vizuală"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transcrierea mesajelor vocale va fi dezactivată dacă termenii și condițiile sunt refuzate."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Dezactivați transcrierea mesajelor vocale"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Mesageria vocală va fi accesibilă numai apelând *86. Setați un cod PIN nou pentru mesageria vocală pentru a continua."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Setați codul PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml
index 1989f26..4994b46 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Включение просмотра голосовой почты"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Вы не будете получать оповещения, пока не активируете визуальную голосовую почту. Позвоните, чтобы прослушать новые сообщения."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Не удалось включить просмотр голосовой почты"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Проверьте подключение к мобильной сети и повторите попытку."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Убедитесь, что телефон подключен к мобильной сети, и повторите попытку."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Отключите режим полета и повторите попытку."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Нет соединения"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Вы не будете получать оповещения о новых голосовых сообщениях. Если телефон подключен к Wi-Fi, выполните синхронизацию."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Вы не будете получать оповещения о новых голосовых сообщениях. Если телефон подключен к Wi-Fi, то вы можете выполнить синхронизацию и проверить голосовую почту сейчас."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Вы не будете получать оповещения о новых сообщениях. Чтобы выполнить синхронизацию, отключите режим полета."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Чтобы проверить голосовую почту, подключите мобильные данные."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Чтобы проверить голосовую почту, подключитесь к мобильному Интернету."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Не удалось включить просмотр голосовой почты"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Чтобы проверить голосовую почту, вы можете позвонить на специальный номер."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Не удалось обновить страницу просмотра голосовой почты"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Дождитесь стабильного сигнала Wi-Fi или мобильной сети и повторите попытку. Если вы хотите проверить почту сейчас, позвоните на специальный номер."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Дождитесь стабильного сигнала мобильной сети и повторите попытку. Если вы хотите проверить почту сейчас, позвоните на специальный номер."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Дождитесь стабильного сигнала Wi-Fi или мобильного Интернета и повторите попытку. Если вы хотите проверить голосовую почту сейчас, позвоните на специальный номер."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Дождитесь стабильного сигнала мобильного Интернета и повторите попытку. Если вы хотите проверить голосовую почту сейчас, позвоните на специальный номер."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Не удалось обновить страницу просмотра голосовой почты"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Чтобы проверить голосовую почту, вы можете позвонить на специальный номер."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Не удалось обновить страницу просмотра голосовой почты"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ошибка"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Свяжитесь со службой поддержки по номеру <xliff:g id="NUMBER">%1$s</xliff:g> и сообщите им код ошибки 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Условия использования визуальной голосовой почты"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Чтобы работать с визуальной голосовой почтой, примите Условия использования Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nЧтобы работать с визуальной голосовой почтой, примите Условия использования Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Включить визуальную голосовую почту"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Если вы не примете Условия использования, визуальная голосовая почта будет отключена."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Отключение визуальной голосовой почты"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Если вы не примете Условия использования, транскрипция голосовых сообщений будет отключена."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Отключение транскрипции голосовых сообщений"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Для прослушивания голосовой почты необходимо будет отправить вызов по номеру *86. Чтобы продолжить, установите новый PIN-код голосовой почты."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Установка PIN-кода"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml
index 2a057fa..ddba002 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කිරීම"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"දෘශ්‍ය හඬ තැපෑල සම්පූර්ණයෙන් සක්‍රිය කරන තෙක් ඔබට හඩ තැපැල් දැනුම් දීම් නොලැබීමට හැකිය. දෘශ්‍ය හඬ තැපෑල සම්පූර්ණයෙන් සක්‍රිය කරන තෙක් නව පණිවිඩ යළි ලබා ගැනීමට හඬ තැපෑල අමතන්න."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කළ නොහැකිය"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ඔබේ දුරකථනයට සෙලියුලර් සම්බන්ධතාවක් ඇති බව පරීක්ෂා කර නැවත උත්සාහ කරන්න."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ඔබේ දුරකථනයට ජංගම ජාල සම්බන්ධතාවක් ඇති බව සහතික කරගෙන නැවත උත්සාහ කරන්න."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ගුවන් යානා ප්‍රකාරය ක්‍රියාවිරහිත කර නැවත උත්සාහ කරන්න."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"සම්බන්ධතාවය නැත"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ඔබට නව හඬ තැපැල් සඳහා දැනුම් දීම් නොලැබෙනු ඇත. ඔබ Wi-Fi මත සිටින්නේ නම්, ඔබට දැන් සමමුහුර්ත කිරීමෙන් හඬ තැපැල් සඳහා පරීක්ෂා කළ හැකිය."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ඔබට නව හඬ තැපැල් සඳහා දැනුම් දීම් නොලැබෙනු ඇත. ඔබ Wi-Fi වල සිටින්නේ නම්, ඔබට දැන් සමමුහුර්ත කිරීමෙන් හඬ තැපෑල සඳහා පරීක්ෂා කළ හැකිය."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ඔබට නව හඬ තැපැල් සඳහා දැනුම් දීම් නොලැබෙනු ඇත. ඔබේ හඬ තැපැල් සමමුහුර්ත කිරීමට ගුවන් යානා ප්‍රකාරය ක්‍රියාවිරහිත කරන්න."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"හඬ තැපැල් පරීක්ෂා කිරීමට ඔබේ දුරකථනයට සෙලියුලර් දත්ත සබැඳුමක් අවශ්‍යය."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"හඬ තැපෑල පරීක්ෂා කිරීමට ඔබේ දුරකථනයට ජංගම දත්ත සම්බන්ධතාවක් අවශ්‍යයි."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කළ නොහැකිය"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ඔබේ Wi-Fi හෝ සෙලියුලර් සබැඳුම වඩා යහපත් විට නැවත උත්සාහ කරන්න. ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ඔබේ සෙලියුලර් දත්ත සබැඳුම වඩා යහපත් විට නැවත උත්සාහ කරන්න. ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ඔබේ Wi-Fi හෝ ජංගම දත්ත සම්බන්ධතාව වඩා යහපත් විට නැවත උත්සාහ කරන්න. ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ඔබේ ජංගම දත්ත සම්බන්ධතාව වඩා යහපත් විට නැවත උත්සාහ කරන්න. ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"යම් දෙයක් වැරදිණි"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"කරුණාකර <xliff:g id="NUMBER">%1$s</xliff:g> අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9999 බව ඔවුන්ට පවසන්න."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"දෘශ්‍ය හඬ තැපෑල් නියම සහ කොන්දේසි"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ඔබ දෘශ්‍ය හඬ තැපෑල භාවිත කිරීමට Verizon Wireless හි නියම සහ කොන්දේසි පිළිගත යුතුය:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nඔබ දෘශ්‍ය හඬ තැපෑල භාවිත කිරීමට Verizon Wireless හි නියම සහ කොන්දේසි පිළිගත යුතුය:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කරන්න"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"නියම සහ කොන්දේසි ප්‍රතික්ෂේප කර ඇති නම් දෘශ්‍ය හඬ තැපෑල අබල කරනු ඇත."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"දෘශ්‍ය හඬ තැපෑල අබල කරන්න"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"නියම සහ කොන්දේසි ප්‍රතික්ෂේප කර ඇති නම් හඬ තැපැල් පිටපත් කිරීම අබල කරනු ඇත."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"හඬ තැපැල් පිටපත් කිරීම අබල කරන්න"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"හඩ තැපෑල *86 වෙත ඇමතීමෙන් පමණක් ලබා ගත හැකිය. ඉදිරියට යාමට නව හඩ තැපැල් PIN එකක් පිහිටුවන්න."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN අංකය සකසන්න"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml
index 165a9f5..692d68b 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktivuje sa vizuálna hlasová schránka"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Kým nebude vizuálna hlasová schránka úplne aktivovaná, pravdepodobne nebudete dostávať upozornenia hlasovej schránky. Kým nebude hlasová schránka úplne aktivovaná, nové správy môžete načítať zavolaním do hlasovej schránky."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizuálna hlasová schránka sa nedá aktivovať"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Skontrolujte, či má telefón mobilné pripojenie, a skúste to znova."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Skontrolujte, či má telefón pripojenie k mobilnej sieti, a skúste to znova."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Vypnite režim v lietadle a skúste to znova."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Žiadne pripojenie"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nedostanete upozornenia na nové hlasové správy. Ak používate Wi-Fi, synchronizáciou môžete skontrolovať hlasovú schránku."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nedostanete upozornenia na nové hlasové správy. Ak používate Wi‑Fi, hlasovú schránku môžete skontrolovať synchronizáciou."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nedostanete upozornenia na nové hlasové správy. Vypnite režim v lietadle a synchronizujte hlasovú schránku."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Na kontrolu hlasovej schránky potrebuje telefón mobilné dátové pripojenie."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Na kontrolu hlasovej schránky potrebuje telefón mobilné dátové pripojenie."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizuálna hlasová schránka sa nedá aktivovať"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizuálna hlasová schránka sa nedá aktualizovať"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Skúste to znova, keď budete mať lepšie pripojenie cez Wi-Fi alebo lepšie mobilné pripojenie. Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Skúste to znova, keď budete mať lepšie mobilné dátové pripojenie. Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Skúste to znova, keď budete mať lepšie pripojenie cez Wi‑Fi alebo lepšie mobilné dátové pripojenie. Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Skúste to znova, keď budete mať lepšie mobilné dátové pripojenie. Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizuálna hlasová schránka sa nedá aktualizovať"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizuálna hlasová schránka sa nedá aktualizovať"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Vyskytol sa problém"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Obráťte sa na služby zákazníkom na čísle <xliff:g id="NUMBER">%1$s</xliff:g> a oznámte kód chyby 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Zmluvné podmienky vizuálnej hlasovej schránky"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Ak chcete používať vizuálnu hlasovú schránku, je nutné prijať zmluvné podmienky spoločnosti Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nAk chcete používať vizuálnu hlasovú schránku, prijmite zmluvné podmienky spoločnosti Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Zapnutie vizuálnej hlasovej schránky"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"V prípade odmietnutia zmluvných podmienok bude vizuálna hlasová schránka zakázaná."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Zakázať vizuálnu hlasovú schránku"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"V prípade odmietnutia zmluvných podmienok bude prepis hlasových správ zakázaný."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Zakázať prepis hlasových správ"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Hlasová schránka bude k dispozícii len po zavolaní na číslo *86. Ak chcete pokračovať, nastavte nový PIN hlasovej schránky."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Nastavenie kódu PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml
index d4f63c1..50a7199 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiviranje vizualnih sporočil v odzivniku"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Dokler niso vizualna sporočila v odzivniku v celoti aktivirana, morda ne boste prejemali obvestil o sporočilih v odzivniku. Pokličite odzivnik, da prenesete nova sporočila, dokler niso sporočila v odzivniku v celoti aktivirana."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizualnih sporočil v odzivniku ni mogoče aktivirati"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Preverite, ali je v telefonu vzpostavljena mobilna internetna povezava, in poskusite znova."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Preverite, ali je v telefonu vzpostavljena povezava z mobilnim omrežjem, in poskusite znova."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Izklopite način za letalo in poskusite znova."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ni povezave"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Obvestil o novih sporočilih v odzivniku ne boste prejemali. Če ste v omrežju Wi-Fi, lahko zdaj zaženete sinhronizacijo in preverite, ali ste prejeli sporočila v odzivniku."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Obvestil o novih sporočilih v odzivniku ne boste prejemali. Če ste v omrežju Wi-Fi, lahko zdaj zaženete sinhronizacijo in preverite, ali ste prejeli sporočila v odzivniku."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Obvestil o novih sporočilih v odzivniku ne boste prejemali. Če želite sinhronizirati sporočila v odzivniku, izklopite način za letalo."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Če želite preveriti sporočila v odzivniku, je treba v telefonu vzpostaviti povezavo za prenos podatkov v mobilnih omrežjih."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Če želite preveriti sporočila v odzivniku, je treba v telefonu vzpostaviti povezavo za prenos podatkov v mobilnem omrežju."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizualnih sporočil v odzivniku ni mogoče aktivirati"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizualnih sporočil v odzivniku ni mogoče posodobiti"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Poskusite znova, ko bo povezava Wi-FI ali mobilna internetna povezava boljša. Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Poskusite znova, ko bo mobilna internetna povezava boljša. Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Poskusite znova, ko bo povezava z omrežjem Wi-Fi ali povezava za prenos podatkov v mobilnem omrežju boljša. Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Poskusite znova, ko bo povezava za prenos podatkov v mobilnem omrežju boljša. Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizualnih sporočil v odzivniku ni mogoče posodobiti"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizualnih sporočil v odzivniku ni mogoče posodobiti"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Prišlo je do napake"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Obrnite se na podporo za stranke na številki <xliff:g id="NUMBER">%1$s</xliff:g> in jim sporočite to kodo napake: 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Določila in pogoji za vizualna sporočila v odzivniku"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Če želite uporabljati vizualna sporočila v odzivniku, morate sprejeti določila in pogoje podjetja Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nČe želite uporabljati vizualna sporočila v odzivniku, morate sprejeti določila in pogoje podjetja Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Vklop vizualnih sporočil v odzivniku"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Če zavrnete določila in pogoje, bodo vizualna sporočila v odzivniku onemogočena."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Onemogočanje vizualnih sporočil v odzivniku"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Če zavrnete določila in pogoje, bo prepis sporočil v odzivniku onemogočen."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Onemogočanje prepisa sporočil v odzivniku"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Sporočila v odzivniku so na voljo samo tako, da pokličete *86. Če želite nadaljevati, nastavite novo kodo PIN za sporočila v odzivniku."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Nastavitev kode PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml
index d400cd8..459760c 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Po aktivizon postën zanore vizuale"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Mund të mos marrësh njoftime të postës zanore derisa posta zanore vizuale të aktivizohet plotësisht. Merr në telefon te posta zanore për të marrë mesazhet e reja derisa posta zanore të aktivizohet plotësisht."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Posta zanore vizuale nuk aktivizohet"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Sigurohu që telefoni tënd të ketë lidhje celulare dhe provo përsëri."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Sigurohu që telefoni yt të ketë një lidhje rrjeti celular dhe provo përsëri."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Çaktivizo modalitetin e aeroplanit dhe provo përsëri."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nuk ka lidhje"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nuk do të njoftohesh për postë zanore të re. Nëse je në rrjetin Wi-Fi, mund të kontrollosh për postë zanore duke sinkronizuar tani."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nuk do të njoftohesh për postat e reja zanore. Nëse je në rrjetin Wi-Fi, mund të kontrollosh për postën zanore duke e sinkronizuar tani."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nuk do të njoftohesh për postë zanore të re. Çaktivizo modalitetin në aeroplan për të sinkronizuar postën zanore."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefoni yt ka nevojë për lidhje me të dhënat celulare për të kontrolluar postën zanore."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefoni yt ka nevojë për një lidhje të të dhënave celulare për të kontrolluar postën zanore."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Posta zanore vizuale nuk aktivizohet"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Përsëri mund të telefonosh për të kontrolluar postën zanore."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Posta zanore vizuale nuk u përditësua"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Provo përsëri kur lidhja Wi-Fi ose celulare të jetë më e mirë. Përsëri mund të telefonosh për të kontrolluar postën zanore."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Provo përsëri kur lidhja e të dhënave celulare të jetë më e mirë. Përsëri mund të telefonosh për të kontrolluar postën zanore."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Provo përsëri kur lidhja Wi-Fi ose e të dhënave celulare të jetë më e mirë. Mund të telefonosh përsëri për të kontrolluar postën zanore."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Provo përsëri kur lidhja e të dhënave celulare të jetë më e mirë. Mund të telefonosh përsëri për të kontrolluar postën zanore."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Posta zanore vizuale nuk u përditësua"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Përsëri mund të telefonosh për të kontrolluar postën zanore."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Posta zanore vizuale nuk u përditësua"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ndodhi një gabim"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontakto me \"Shërbimin e klientit\" në <xliff:g id="NUMBER">%1$s</xliff:g> dhe tregoju kodin e gabimit 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Kushtet e përgjithshme të postës zanore vizuale"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Duhet të pranosh kushtet e përgjithshme të Verizon Wireless për të përdorur postën zanore vizuale:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDuhet të pranosh kushtet e përgjithshme të Verizon Wireless për të përdorur postën zanore vizuale:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Aktivizo postën zanore vizuale"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Posta zanore vizuale duhet të çaktivizohet nëse refuzohen kushtet e përgjithshme."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Çaktivizo postën zanore vizuale"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkriptimi i postës zanore do të çaktivizohet nëse refuzohen kushtet e përgjithshme."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Çaktivizo transkriptimin e postës zanore"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Do të mund të qasesh te posta zanore vetëm duke telefonuar në *86. Cakto një kod PIN të ri për postën zanore për të vazhduar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Konfiguro kodin PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml
index da1853a..6c65572 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Активира се визуелна говорна пошта"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Можда нећете добијати обавештења о говорној пошти док потпуно не активирате визуелну говорну пошту. Позовите говорну пошту да бисте преузели нове поруке док говорна пошта не буде потпуно активирана."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Активирање визуелне говорне поште није успело"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Проверите да ли телефон има мобилну везу и покушајте поново."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Проверите да ли телефон има везу преко мобилне мреже и пробајте поново."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Искључите режим рада у авиону и покушајте поново."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Веза није успостављена"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Нећете добијати обавештења о новим говорним порукама. Ако сте на Wi-Fi мрежи, синхронизујте да бисте проверили говорну пошту."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Нећете добијати обавештења о новим говорним порукама. Ако сте на Wi‑Fi мрежи, можете да синхронизујете да бисте проверили говорну пошту."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Нећете добијати обавештења о новим говорним порукама. Искључите режим рада у авиону да бисте синхронизовали говорну пошту."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Телефону треба мобилна веза за пренос података да бисте проверили говорну пошту."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Телефону је за проверу говорне поште потребна мобилна веза за пренос података."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Активирање визуелне говорне поште није успело"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"И даље можете да позовете говорну пошту да бисте је проверили."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Ажурирање визуелне говорне поште није успело"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Пробајте поново кад будете имали бољу Wi-Fi или мобилну везу. И даље можете да позовете говорну пошту да бисте је проверили."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Пробајте поново кад будете имали бољу мобилну везу за пренос података. И даље можете да позовете говорну пошту да бисте је проверили."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Пробајте поново кад будете имали бољу Wi‑Fi или мобилну везу за пренос података. И даље можете да позовете говорну пошту да бисте је проверили."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Пробајте поново кад будете имали бољу мобилну везу за пренос података. И даље можете да позовете говорну пошту да бисте је проверили."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Ажурирање визуелне говорне поште није успело"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"И даље можете да позовете говорну пошту да бисте је проверили."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Ажурирање визуелне говорне поште није успело"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Нешто није у реду"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Контактирајте корисничку подршку на <xliff:g id="NUMBER">%1$s</xliff:g> и реците им да је кôд грешке 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Услови и одредбе за визуелну говорну пошту"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Морате да прихватите Verizon Wireless услове и одредбе да бисте користили визуелну говорну пошту:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nМорате да прихватите Verizon Wireless услове и одредбе да бисте користили визуелну говорну пошту:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Укључите визуелну говорну пошту"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ако одбијете услове и одредбе, онемогућићете визуелну говорну пошту."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Онемогућите визуелну говорну пошту"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Транскрипција говорне поште ће бити онемогућена ако се услови и одредбе одбију."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Онемогућите транскрипцију говорне поште"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Говорној пошти ћете моћи да приступите само ако позовете *86. Подесите нови PIN кôд говорне поште да бисте наставили."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Подесите PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml
index cfab830..22dea5e 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiverar visuell röstbrevlåda"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Du får kanske inte röstmeddelanden tills visuell röstbrevlåda är helt aktiverad. Ring röstbrevlådan för att hämta nya meddelanden innan den är helt aktiverad."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Det går inte att aktivera visuell röstbrevlåda"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Se till att mobilen har en mobildataanslutning och försök igen."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Se till att mobilen har en mobilnätverksanslutning och försök igen."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Inaktivera flygplansläget och försök igen."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ingen anslutning"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Du meddelas inte om nya röstmeddelanden. Om du är ansluten till Wi-Fi kan du kontrollera om du har fått nya röstmeddelanden genom att synkronisera."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Du meddelas inte om nya röstmeddelanden. Om du är ansluten till Wi-Fi kan du lyssna på nya röstmeddelanden genom att synkronisera nu."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Du blir inte meddelad om nya röstmeddelanden. Inaktivera flygplansläget om du vill synkronisera röstbrevlådan."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Mobilen måste ha en mobildataanslutning för att du ska kunna lyssna av röstbrevlådan."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Mobilen måste ha en mobildataanslutning för att lyssna av röstbrevlådan."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Det går inte att aktivera visuell röstbrevlåda"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Du kan fortfarande lyssna av röstbrevlådan genom att ringa."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Det går inte att uppdatera den visuella röstbrevlådan"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Försök igen när du har en bättre Wi-Fi- eller mobildataanslutning. Du kan fortfarande lyssna av röstbrevlådan."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Försök igen när du har en bättre mobildataanslutning. Du kan fortfarande lyssna av röstbrevlådan."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Försök igen när du har en bättre Wi-Fi- eller mobildataanslutning. Det går fortfarande att lyssna av röstbrevlådan."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Försök igen när du har en bättre mobildataanslutning. Det går fortfarande att lyssna av röstbrevlådan."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Det går inte att uppdatera den visuella röstbrevlådan"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Du kan fortfarande lyssna av röstbrevlådan genom att ringa."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Det går inte att uppdatera den visuella röstbrevlådan"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Något gick fel"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontakta kundtjänst på <xliff:g id="NUMBER">%1$s</xliff:g> och ange felkoden 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Användarvillkor för visuell röstbrevlåda"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Du måste acceptera Verizon Wireless användarvillkor för att använda visuell röstbrevlåda:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDu måste godkänna Verizon Wireless användarvillkor för att använda visuell röstbrevlåda:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Aktivera visuell röstbrevlåda"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuell röstbrevlåda inaktiveras om användarvillkoren avböjs."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Inaktivera visuell röstbrevlåda"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkription av röstbrevlådan inaktiveras om användarvillkoren avböjs."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Inaktivera transkription av röstbrevlåda"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Röstbrevlådan är endast tillgänglig genom att ringa *86. Fortsätt genom att ställa in en ny PIN-kod till röstbrevlådan."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Ställ in pinkod"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml
index 56aad21..6b8b1f3 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Inawasha kipengele cha ujumbe wa sauti unaoonekana"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Huenda usipokee arifa za ujumbe wa sauti mpaka kipengele cha ujumbe wa sauti unaoonekana kiwe kimewashwa kabisa. Piga nambari ya ujumbe wa sauti ili upate ujumbe mpya mpaka kipengele hicho kitakapokuwa kimewashwa kabisa."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Imeshindwa kuwasha kipengele cha ujumbe wa sauti unaoonekana"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Hakikisha kwamba simu yako ina muunganisho wa mtandao wa simu kisha ujaribu tena."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Hakikisha kwamba simu yako ina muunganisho wa mtandao wa simu kisha ujaribu tena."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Zima hali ya ndegeni kisha ujaribu tena."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Hakuna muunganisho"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Hutaarifiwa ukipata ujumbe mpya wa sauti. Kama unatumia Wi-Fi sasa hivi, unaweza kuangalia kama una ujumbe wa sauti kwa kusawazisha sasa."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Hutaarifiwa ukipata ujumbe mpya wa sauti. Kama unatumia Wi-Fi sasa hivi, unaweza kuangalia kama una ujumbe wa sauti kwa kusawazisha sasa."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Hutaarifiwa ukipata ujumbe mpya wa sauti. Zima hali ya ndegeni ili usawazishe ujumbe wa sauti."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Simu yako inahitaji muunganisho wa mtandao wa simu kufungua ujumbe wa sauti."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Simu yako inahitaji muunganisho wa mtandao wa simu kufungua ujumbe wa sauti."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Imeshindwa kuwasha kipengele cha ujumbe wa sauti unaoonekana"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Jaribu tena baadaye muunganisho wa Wi-Fi au mtandao wa simu ukiimarika. Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Jaribu tena baadaye muunganisho wa data ya simu za mkononi ukiimarika. Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Jaribu tena baadaye muunganisho wa Wi-Fi au mtandao wa simu ukiimarika. Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Jaribu tena baadaye muunganisho wa data ya simu za mkononi ukiimarika. Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana"</string>
@@ -102,9 +102,15 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Hitilafu Fulani Imetokea"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia <xliff:g id="NUMBER">%1$s</xliff:g> na uwaambie kwamba msimbo wa hitilafu ni 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Sheria na Masharti ya kipengele cha Ujumbe wa Sauti Unaoonekana"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Lazima ukubali sheria na masharti ya Verizon Wireless ili uweze kutumia kipengele cha ujumbe wa sauti unaoonekana:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nNi lazima ukubali sheria na masharti ya Verizon Wireless ili uweze kutumia kipengele cha ujumbe wa sauti:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Washa Kipengele cha Ujumbe wa Sauti Unaoonekana"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for dialer_terms_and_conditions_message (6207219973959897196) -->
+    <skip />
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Kipengele cha ujumbe wa sauti unaoonekana kitazimwa ukikataa sheria na masharti."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Zima kipengele cha ujumbe wa sauti unaoonekana"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Kipengele cha unukuzi wa ujumbe wa sauti kitazimwa ukikataa sheria na masharti."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Zima kipengele cha unukuzi wa ujumbe wa sauti"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Utaweza kupata ujumbe wa sauti kwa kupiga *86 tu. Weka PIN mpya ya ujumbe wa sauti ili uweze kuendelea."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Weka PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml
index f2613f0..5a51c94 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"விஷூவல் குரலஞ்சலைச் செயல்படுத்துகிறது"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"விஷுவல் குரலஞ்சலை முழுவதுமாக இயக்கும் வரை, உங்களால் குரலஞ்சல் அறிவிப்புகளைப் பெற முடியாமல் போகலாம். குரலஞ்சலை முழுவதுமாக இயக்கும் வரை புதிய செய்திகளைப் பெற, குரலஞ்சலை அழைக்கவும்."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"விஷூவல் குரலஞ்சலைச் செயல்படுத்த முடியவில்லை"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"உங்கள் மொபைலில் செல்லுலார் இணைப்பு உள்ளதை உறுதிசெய்து, மீண்டும் முயலவும்."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"உங்கள் ஃபோனில் மொபைல் நெட்வொர்க் இணைப்பு உள்ளதை உறுதிசெய்து, மீண்டும் முயலவும்."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"விமானப் பயன்முறையை முடக்கி, மீண்டும் முயலவும்."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"இணைப்பு இல்லை"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"புதிய குரலஞ்சல்கள் குறித்த அறிவிப்புகளைப் பெறமாட்டீர்கள். வைஃபை இணைப்பைப் பயன்படுத்திக்கொண்டிருந்தால், இப்போதே ஒத்திசைத்து குரலஞ்சல் உள்ளதா எனப் பார்க்கலாம்."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"புதிய குரலஞ்சல்கள் குறித்த அறிவிப்புகளைப் பெறமாட்டீர்கள். வைஃபை இணைப்பைப் பயன்படுத்திக்கொண்டிருந்தால், இப்போதே ஒத்திசைத்து குரலஞ்சல் உள்ளதா எனப் பார்க்கலாம்."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"புதிய குரலஞ்சல்கள் குறித்த அறிவிப்புகளைப் பெறமாட்டீர்கள். குரலஞ்சலை ஒத்திசைக்க, விமானப் பயன்முறையை முடக்கவும்."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"குரலஞ்சலைப் பார்க்க, உங்கள் மொபைலில் செல்லுலார் தரவு இணைப்பு இருக்க வேண்டும்."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"குரலஞ்சலைக் கேட்க, உங்கள் ஃபோனில் மொபைல் தரவு இணைப்பு இருக்க வேண்டும்."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"விஷூவல் குரலஞ்சலைச் செயல்படுத்த முடியவில்லை"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"விஷூவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"வைஃபை அல்லது செல்லுலார் இணைப்பின் வேகம் முன்பை விட அதிகமாகும் போது, மீண்டும் முயலவும். குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"செல்லுலார் தரவு இணைப்பின் வேகம் முன்பை விட அதிகமாகும் போது, மீண்டும் முயலவும். குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"வைஃபை அல்லது மொபைல் தரவு இணைப்பின் வேகம் முன்பை விட அதிகமாகும் போது, மீண்டும் முயலவும். குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"மொபைல் தரவு இணைப்பின் வேகம் முன்பை விட அதிகமாகும் போது, மீண்டும் முயலவும். குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"விஷூவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"விஷூவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"ஏதோ தவறாகிவிட்டது"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"<xliff:g id="NUMBER">%1$s</xliff:g> என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9999 எனக் கூறவும்."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"விஷுவல் குரலஞ்சலின் விதிமுறைகள் மற்றும் நிபந்தனைகள்"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"விஷுவல் குரலஞ்சலைப் பயன்படுத்த Verizon Wireless இன் விதிமுறைகள் மற்றும் நிபந்தனைகளை ஏற்க வேண்டும்:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nவிஷுவல் குரலஞ்சலைப் பயன்படுத்த, Verizon Wireless இன் விதிமுறைகளையும் நிபந்தனைகளையும் ஏற்க வேண்டும்:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"விஷுவல் குரலஞ்சலை இயக்கவும்"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"விதிமுறைகள் மற்றும் நிபந்தனைகள் நிராகரிக்கப்பட்டால், விஷுவல் குரலஞ்சல் முடக்கப்படும்."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"விஷுவல் குரலஞ்சலை முடக்கு"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"விதிமுறைகளையும் நிபந்தனைகளையும் நிராகரித்தீர்கள் எனில், குரலஞ்சல் டிரான்ஸ்கிரிப்ஷன் முடக்கப்படும்."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"குரலஞ்சல் டிரான்ஸ்கிரிப்ஷனை முடக்கு"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*86ஐ அழைத்தால் மட்டுமே, குரலஞ்சலை அணுக முடியும். தொடர, புதிய குரலஞ்சல் பின்னை அமைக்கவும்."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"பின்னை அமை"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml
index a881550..f2086c4 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేస్తోంది"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"దృశ్య వాయిస్ మెయిల్ పూర్తిగా సక్రియం అయ్యే వరకు మీరు వాయిస్ మెయిల్ నోటిఫికేషన్‌లను స్వీకరించలేకపోవచ్చు. వాయిస్ మెయిల్ పూర్తిగా సక్రియం అయ్యే వరకు కొత్త సందేశాలను తిరిగి పొందడానికి వాయిస్ మెయిల్‌కి కాల్ చేయండి."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేయడం సాధ్యపడదు"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"మీ ఫోన్‌కు సెల్యులార్ కనెక్షన్ ఉన్నట్లు నిర్ధారించుకొని, ఆపై మళ్లీ ప్రయత్నించండి."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"మీ ఫోన్‌కు మొబైల్ నెట్‌వర్క్ కనెక్షన్ ఉన్నట్లు నిర్ధారించుకొని, ఆపై మళ్లీ ప్రయత్నించండి."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేసి, ఆపై మళ్లీ ప్రయత్నించండి."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"కనెక్షన్ లేదు"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"మీకు కొత్త వాయిస్ మెయిల్‌ల గురించి తెలియజేయబడదు. మీరు Wi-Fiలో ఉంటే, ఇప్పుడే సమకాలీకరించడం ద్వారా వాయిస్ మెయిల్‌‍ను తనిఖీ చేయవచ్చు."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"మీకు కొత్త వాయిస్ మెయిల్‌ల గురించి తెలియజేయబడదు. మీరు Wi-Fiలో ఉంటే, ఇప్పుడే సమకాలీకరించడం ద్వారా వాయిస్ మెయిల్‌‍ను తనిఖీ చేయవచ్చు."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"మీకు కొత్త వాయిస్ మెయిల్‌ల గురించి తెలియజేయబడదు. మీ వాయిస్ మెయిల్‌‍ను సమకాలీకరించడానికి ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేయండి."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి మీ ఫోన్‌కు సెల్యులార్ డేటా కనెక్షన్ అవసరం."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి మీ ఫోన్‌కు మొబైల్ డేటా కనెక్షన్ అవసరం."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేయడం సాధ్యపడదు"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"మీ Wi-Fi లేదా సెల్యులార్ కనెక్షన్ మెరుగైనప్పుడు మళ్లీ ప్రయత్నించండి. మీరు వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి ఇప్పటికీ కాల్ చేయవచ్చు."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"మీ సెల్యులార్ డేటా కనెక్షన్ మెరుగైనప్పుడు మళ్లీ ప్రయత్నించండి. మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"మీ Wi-Fi లేదా మొబైల్ డేటా కనెక్షన్ మెరుగైనప్పుడు మళ్లీ ప్రయత్నించండి. మీరు వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి ఇప్పటికీ కాల్ చేయవచ్చు."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"మీ మొబైల్ డేటా కనెక్షన్ మెరుగైనప్పుడు మళ్లీ ప్రయత్నించండి. మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"ఏదో తప్పు జరిగింది"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"దయచేసి <xliff:g id="NUMBER">%1$s</xliff:g> నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి లోపం కోడ్ 9999గా తెలపండి."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"దృశ్య వాయిస్ మెయిల్ నిబంధనలు మరియు షరతులు"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"మీరు దృశ్య వాయిస్ మెయిల్‌ను ఉపయోగించడానికి తప్పనిసరిగా Verizon వైర్‌లెస్ నిబంధనలు మరియు షరతులను ఆమోదించాలి:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nమీరు దృశ్య వాయిస్ మెయిల్‌ను ఉపయోగించాలంటే Verizon Wireless నిబంధనలు మరియు షరతులను తప్పనిసరిగా ఆమోదించాలి:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"దృశ్య వాయిస్ మెయిల్‌ను ఆన్ చేయండి"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"నిబంధనలు మరియు షరతులను తిరస్కరిస్తే దృశ్య వాయిస్ మెయిల్ నిలిపివేయబడుతుంది."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"దృశ్య వాయిస్ మెయిల్‌ను నిలిపివేయండి"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"నిబంధనలు మరియు షరతులను నిరాకరిస్తే వాయిస్ మెయిల్ లిప్యంతరీకరణ నిలిపివేయబడుతుంది."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"వాయిస్ మెయిల్ లిప్యంతరీకరణను నిలిపివేయండి"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"వాయిస్ మెయిల్‌ను కేవలం *86కి కాల్ చేయడం ద్వారా మాత్రమే ప్రాప్యత చేయగలరు. కొనసాగించడానికి కొత్త వాయిస్ మెయిల్ PINని సెట్ చేయండి."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PINని సెట్ చేయండి"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml
index 31302cc..fffae99 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"กำลังเปิดใช้ข้อความเสียงพร้อมภาพ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"คุณอาจไม่ได้รับการแจ้งเตือนข้อความเสียงจนกว่าจะเปิดใช้ข้อความเสียงพร้อมภาพแบบเต็มรูปแบบ โทรฟังข้อความเสียงเพื่อเรียกข้อความใหม่จนกว่าจะเปิดใช้ข้อความเสียงพร้อมภาพแบบเต็มรูปแบบ"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"เปิดใช้ข้อความเสียงพร้อมภาพไม่ได้"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"โปรดตรวจสอบว่าโทรศัพท์เชื่อมต่อเครือข่ายมือถืออยู่ แล้วลองใหม่"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"โปรดตรวจสอบว่าโทรศัพท์เชื่อมต่อเครือข่ายมือถืออยู่ แล้วลองใหม่"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ปิดโหมดบนเครื่องบินและลองใหม่"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ไม่มีการเชื่อมต่อ"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"คุณจะไม่ได้รับข้อความเสียงใหม่ ถ้าเปิด Wi-Fi อยู่ คุณจะตรวจสอบข้อความเสียงได้โดยซิงค์เลย"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"คุณจะไม่ได้รับข้อความเสียงใหม่ ถ้าคุณใช้เครือข่าย Wi-Fi อยู่ สามารถตรวจสอบข้อความเสียงได้โดยซิงค์เดี๋ยวนี้"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"คุณจะไม่ได้รับข้อความเสียงใหม่ ปิดโหมดบนเครื่องบินเพื่อซิงค์ข้อความเสียง"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"โทรศัพท์ต้องเชื่อมต่ออินเทอร์เน็ตมือถือ จึงจะตรวจสอบข้อความเสียงได้"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"โทรศัพท์ต้องเชื่อมต่ออินเทอร์เน็ตมือถือจึงจะตรวจสอบข้อความเสียงได้"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"เปิดใช้ข้อความเสียงพร้อมภาพไม่ได้"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ไม่สามารถอัปเดตข้อความเสียงพร้อมภาพได้"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ลองใหม่เมื่อ Wi-Fi หรือสัญญาณเชื่อมต่อเครือข่ายมือถือดีขึ้น คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ลองใหม่เมื่อสัญญาณเชื่อมต่อเครือข่ายมือถือดีขึ้น คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ลองใหม่เมื่อ Wi-Fi หรือการเชื่อมต่ออินเทอร์เน็ตมือถือถือดีขึ้น คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ลองใหม่เมื่อการเชื่อมต่ออินเทอร์เน็ตมือถือดีขึ้น คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ไม่สามารถอัปเดตข้อความเสียงพร้อมภาพได้"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ไม่สามารถอัปเดตข้อความเสียงพร้อมภาพได้"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"เกิดข้อผิดพลาด"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข <xliff:g id="NUMBER">%1$s</xliff:g> และแจ้งรหัสข้อผิดพลาด 9999"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ข้อกำหนดในการให้บริการข้อความเสียงพร้อมภาพ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"คุณต้องยอมรับข้อกำหนดในการให้บริการของ Verizon Wireless จึงจะใช้ข้อความเสียงพร้อมภาพได้:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nคุณต้องยอมรับข้อกำหนดในการให้บริการของ Verizon Wireless เพื่อใช้ข้อความเสียงพร้อมภาพ:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"เปิดใช้ข้อความเสียงพร้อมภาพ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"หากคุณไม่ยอมรับข้อกำหนดในการใช้บริการ ข้อความเสียงพร้อมภาพจะถูกปิดใช้งาน"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ปิดใช้ข้อความเสียงพร้อมภาพ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"หากคุณไม่ยอมรับข้อกำหนดในการใช้บริการ การถอดข้อความเสียงจะปิดใช้งาน"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ปิดใช้การถอดข้อความเสียง"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"คุณสามารถรับฟังข้อความเสียงด้วยการโทรไป *86 เท่านั้น และตั้งค่า PIN ข้อความเสียงใหม่เพื่อดำเนินการต่อ"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"ตั้งค่า PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml
index b99d0c3..b7b0caf 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ina-activate ang visual na voicemail"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Maaaring hindi ka makatanggap ng mga notification sa voicemail hanggang sa ganap na ma-activate ang visual na voicemail. Tawagan ang voicemail upang makuha ang mga bagong mensahe hanggang sa ganap na ma-activate ang voicemail."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Hindi ma-activate ang visual na voicemail"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Tiyaking mayroong cellular na koneksyon ang iyong telepono at subukang muli."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Tiyaking mayroong koneksyon sa mobile network ang iyong telepono at subukang muli."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"I-off ang airplane mode at subukang muli."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Walang koneksyon"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Hindi ka aabisuhan para sa mga bagong voicemail. Kung nasa Wi-Fi ka, maaari mong tingnan ang voicemail sa pamamagitan ng pag-sync ngayon."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Hindi ka aabisuhan para sa mga bagong voicemail. Kung nasa Wi-Fi ka, maaari mong tingnan ang voicemail sa pamamagitan ng pag-sync ngayon."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Hindi ka aabisuhan para sa mga bagong voicemail. I-off ang airplane mode para i-sync ang iyong voicemail."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Kailangan ng cellular data na koneksyon ng iyong telepono upang tingnan ang voicemail."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Kailangan ng koneksyon ng mobile data ng iyong telepono upang tingnan ang voicemail."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Hindi ma-activate ang visual na voicemail"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Maaari ka pa ring tumawag upang tingnan ang voicemail."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Hindi ma-update ang visual na voicemail"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Subukang muli kapag mas maganda na ang iyong Wi-Fi o cellular na koneksyon. Maaari ka pa ring tumawag upang tingnan ang voicemail."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Subukang muli kapag mas maganda na ang iyong cellular data na koneksyon. Maaari ka pa ring tumawag upang tingnan ang voicemail."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Subukang muli kapag mas maganda na ang iyong Wi-Fi o koneksyon ng mobile data."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Subukang muli kapag mas maganda na ang iyong koneksyon ng mobile data. Maaari ka pa ring tumawag upang tingnan ang voicemail."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Hindi ma-update ang visual na voicemail"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Maaari ka pa ring tumawag upang tingnan ang voicemail."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Hindi ma-update ang visual na voicemail"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Nagkaroon ng Problema"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Pakikontak ang Customer Service sa <xliff:g id="NUMBER">%1$s</xliff:g> at sabihin sa kanila na ang code ng error ay 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Mga Tuntunin at Kundisyon ng Visual na Voicemail"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Kailangan mong tanggapin ang mga tuntunin at kundisyon ng Verizon Wireless upang gamitin ang visual na voicemail:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nKailangan mong tanggapin ang mga tuntunin at kundisyon ng Verizon Wireless upang gamitin ang visual na voicemail:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"I-on ang Visual na Voicemail"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Idi-disable ang visual na voicemail kung tatanggihan ang mga tuntunin at kundisyon."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"I-disable ang visual na voicemail"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Idi-disable ang transkripsyon ng voicemail kung tatanggihan ang mga tuntunin at kundisyon."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"I-disable ang transkripsyon ng voicemail"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Maa-access lang ang voicemail sa pamamagitan ng pagtawag sa *86. Magtakda ng bagong PIN sa voicemail upang magpatuloy."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Magtakda ng PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml
index be5cbb0..3d0e379 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Görsel sesli mesaj etkinleştiriliyor"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Görsel sesli mesaj tam olarak etkinleştirilene dek sesli mesaj bildirimlerini almayabilirsiniz. Sesli mesaj tam olarak etkinleştirilene kadar, yeni mesajları almak için sesli mesaj hizmetini arayın."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Görsel sesli mesaj etkinleştirilemiyor"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Telefonunuzda hücresel bağlantı bulunduğundan emin olun ve tekrar deneyin."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Telefonunuzda mobil ağ bağlantısı olduğundan emin olup tekrar deneyin."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Uçak modunu kapatıp tekrar deneyin."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Bağlantı yok"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Yeni sesli mesajlarla ilgili olarak bilgilendirilmeyeceksiniz. Kablosuz bağlantınız varsa şimdi senkronizasyon gerçekleştirerek sesli mesajlarınızı kontrol edebilirsiniz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Yeni sesli mesajlarla ilgili olarak bilgilendirilmeyeceksiniz. Kablosuz bağlantınız varsa şimdi senkronizasyon gerçekleştirerek sesli mesajlarınızı kontrol edebilirsiniz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Yeni sesli mesajlarla ilgili olarak bilgilendirilmeyeceksiniz. Sesli mesajlarınızı senkronize etmek için uçak modunu kapatın."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Sesli mesaj kontrolü için telefonunuzda hücresel veri bağlantısı bulunmalıdır."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Sesli mesaj kontrolü için telefonunuzda mobil veri bağlantısı olmalıdır."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Görsel sesli mesaj etkinleştirilemiyor"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Görsel sesli mesaj güncellenemiyor"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Kablosuz veya hücresel bağlantı kalitesi daha iyi olduğunda tekrar deneyin. Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Hücresel veri bağlantısı kalitesi daha iyi olduğunda tekrar deneyin. Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Kablosuz veya mobil veri bağlantısı kalitesi daha iyi olduğunda tekrar deneyin. Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Mobil veri bağlantısı kalitesi daha iyi olduğunda tekrar deneyin. Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Görsel sesli mesaj güncellenemiyor"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Görsel sesli mesaj güncellenemiyor"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Bir Sorun Oluştu"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Lütfen <xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9999 olduğunu bildirin."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Görsel Sesli Mesaj Şartlar ve Koşulları"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Görsel sesli mesajı kullanmak için Verizon Wireless\'ın şartlar ve koşullarını kabul etmelisiniz:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nGörsel sesli mesajı kullanabilmek için Verizon Wireless\'ın şartlar ve koşullarını kabul etmelisiniz:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Görsel Sesli Mesaj\'ı etkinleştirme"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Şartlar ve koşullar reddedilirse görsel sesli mesaj devre dışı bırakılır."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Görsel sesli mesajı devre dışı bırak"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Şartlar ve koşullar reddedilirse sesli mesaj çeviri yazısı devre dışı bırakılır."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Sesli mesaj çeviri yazısını devre dışı bırakın"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Sesli mesajlara yalnızca *86 aranarak erişilebilir. Devam etmek için yeni bir sesli mesaj PIN\'i belirleyin."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN belirleyin"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml
index 6adf49a..08cfb23 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Активація візуальної голосової пошти"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Якщо візуальну голосову пошту активовано неповністю, сповіщення голосової пошти можуть не надходити. У такому разі слід телефонувати на голосову пошту, щоб прослуховувати нові повідомлення."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Не вдалось активувати візуальну голосову пошту"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Переконайтеся, що в телефоні ввімкнено мобільний зв’язок, і спробуйте ще раз."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Переконайтеся, що в телефоні ввімкнено мобільний Інтернет, і спробуйте ще раз."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Вимкніть режим польоту та спробуйте ще раз."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Немає з’єднання"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Ви не отримуватимете сповіщення про нові повідомлення голосової пошти. Якщо активовано Wi-Fi, можете просто ввімкнути синхронізацію, і нові повідомлення завантажаться."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Ви не отримуватимете сповіщення про нові повідомлення голосової пошти. Якщо активовано Wi-Fi, можете просто ввімкнути синхронізацію, і нові повідомлення завантажаться."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Ви не отримуватимете сповіщення про нові повідомлення голосової пошти. Щоб синхронізувати голосову пошту, вимкніть режим польоту."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Щоб перевірити голосову пошту, потрібен мобільний трафік."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Щоб перевірити голосову пошту, потрібно ввімкнути мобільний Інтернет."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Не вдалось активувати візуальну голосову пошту"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Не вдалось оновити візуальну голосову пошту"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Спробуйте ще раз, коли буде кращий мобільний або Wi-Fi-зв’язок. Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Спробуйте ще раз, коли буде кращий мобільний зв’язок. Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Спробуйте ще раз, коли буде вища швидкість мобільного Інтернету або кращий сигнал Wi-Fi. Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Спробуйте ще раз, коли буде вища швидкість мобільного Інтернету. Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Не вдалось оновити візуальну голосову пошту"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Не вдалось оновити візуальну голосову пошту"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Сталася помилка"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Зв’яжіться зі службою обслуговування клієнтів за номером <xliff:g id="NUMBER">%1$s</xliff:g> і повідомте такий код помилки: 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Умови використання візуальної голосової пошти"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Щоб використовувати візуальну голосову пошту, потрібно прийняти Умови використання Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nЩоб використовувати візуальну голосову пошту, потрібно прийняти правила та умови Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Увімкнути візуальну голосову пошту"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Якщо відхилити умови використання, візуальну голосову пошту буде вимкнено."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Вимкнути візуальну голосову пошту"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Якщо відхилити правила та умови, транскрипцію голосової пошти буде вимкнено."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Вимкнути транскрипцію голосової пошти"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Прослухати голосову пошту можна буде, лише набравши *86. Установіть новий PIN-код для голосової пошти, щоб продовжити."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Установити PIN-код"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml
index e6fd9f7..55f1e0b 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"بصری صوتی میل کو فعال کیا جا رہا ہے"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"بصری صوتی میل کے مکمل طور پر فعال ہونے تک ہو سکتا ہے آپ کو صوتی میل کی اطلاعات موصول نہ ہو۔ صوتی میل کے مکمل طور پر فعال ہونے تک نئے پیغامات کی بازیافت کیلئے صوتی میل پر کال کریں۔"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"بصری صوتی میل کو فعال نہیں کیا جا سکتا"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"یقینی بنائیں کہ آپ کے فون میں ایک سیلولر کنکشن موجود ہے اور دوبارہ کوشش کریں۔"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"یقینی بنائیں کہ آپ کے فون میں ایک موبائل کنکشن موجود ہے اور دوبارہ کوشش کریں۔"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ہوائی جہاز وضع آف کریں اور دوبارہ کوشش کریں۔"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"کوئی کنکشن نہیں ہے"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"‏آپ کو نئی صوتی میلز سے مطلع نہیں کیا جائے گا۔ اگر آپ Wi-Fi پر ہیں تو آپ ابھی مطابقت پذیری کرکے صوتی میل کیلئے چیک کر سکتے ہیں۔"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"‏آپ کو نئی صوتی میلز سے مطلع نہیں کیا جائے گا۔ اگر آپ Wi-Fi پر ہیں تو آپ ابھی مطابقت پذیری کرکے صوتی میل کیلئے چیک کر سکتے ہیں۔"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"آپ کو نئی صوتی میلز سے مطلع نہیں کیا جائے گا۔ اپنی صوتی میل کو مطابقت پذیر بنانے کیلئے ہوائی جہاز وضع آف کریں۔"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"صوتی میل چیک کرنے کیلئے آپ کے فون کو سیلولر ڈیٹا کنکشن کی ضرورت ہے۔"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"صوتی میل چیک کرنے کیلئے آپ کے فون کو موبائل ڈیٹا کنکشن کی ضرورت ہے۔"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"بصری صوتی میل کو فعال نہیں کیا جا سکتا"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"بصری صوتی میل اپ ڈیٹ نہیں ہو سکتی"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"‏جب آپ کا Wi-Fi یا سیلولر کنکشن بہتر تو دوبارہ کوشش کریں۔ صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"جب آپ کا سیلولر ڈیٹا کنکشن بہتر تو دوبارہ کوشش کریں۔ صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"‏جب آپ کا Wi-Fi یا موبائل کنکشن بہتر تو دوبارہ کوشش کریں۔ صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"جب آپ کا موبائل ڈیٹا کنکشن بہتر تو دوبارہ کوشش کریں۔ صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"بصری صوتی میل اپ ڈیٹ نہیں ہو سکتی"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"بصری صوتی میل اپ ڈیٹ نہیں ہو سکتی"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"کچھ غلط ہوگیا"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"براہ کرم <xliff:g id="NUMBER">%1$s</xliff:g> پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9999 ہے۔"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"بصری صوتی میل کی شرائط و ضوابط"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"‏بصری صوتی میل استعمال کرنے کیلئے آپ کو Verizon وائرلیس کی شرائط و ضوابط قبول کرنا ہونگی:\n\n‎%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"‏%1$s\n\nصوتی میل استعمال کرنے کیلئے آپ کو Verizon وائرلیس کی شرائط و ضوابط قبول کرنی چاہئیں::\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"بصری صوتی میل آن کریں"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"‎%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"شرائط و ضوابط مسترد کئے جانے کی صورت میں بصری صوتی میل غیر فعال کر دی جائے گی۔"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"بصری صوتی میل کو غیر فعال کریں"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"شرائط و ضوابط مسترد کئے جانے کی صورت میں صوتی میل ٹرانسکرپشن غیر فعال کر دی جائے گی۔"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"صوتی میل ٹرانسکرپشن غیر فعال کریں"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"‏صوتی میل تک رسائی صرف ‎*86 کو کال کرنے سے ہوگی۔ آگے بڑھنے کیلئے صوتی میل کی نئی PIN سیٹ کریں۔"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"‏PIN سیٹ کریں"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml
index 5583e27..f312074 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Vizual ovozli pochta faollashtirilmoqda"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Vizual ovozli pochta xizmati faollashtirilmasa, yangi ovozli xabarlar haqida bildirishnoma kelmaydi. Ungacha ovozli pochtaga qo‘ng‘iroq qilib, yangi xabarlarni tinglashingiz mumkin."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizual ovozli pochtani faollashtirib bo‘lmadi"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Telefoningizda uyali aloqa faol ekanligini tekshiring va qayta urinib ko‘ring."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Telefoningizda mobil internet yoqilganligini tekshiring va qayta urinib ko‘ring."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Parvoz rejimini o‘chiring va qayta urinib ko‘ring."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Aloqa yo‘q"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Sizga yangi ovozli pochta xabarlari haqida bildirishnoma kelmaydi. Agar Wi-Fi tarmog‘idan foydalanayotgan bo‘lsangiz, xabarlarni olish uchun shunchaki sinxronlash xususiyatini yoqing."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Sizga yangi ovozli xabarlar haqida bildirishnoma kelmaydi. Wi-Fi tarmog‘iga ulangan qurilmangizda sinxronizatsiya yoqilsa, xabarlar yuklanadi."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Sizga yangi ovozli pochta xabarlari haqida bildirishnoma kelmaydi. Ovozli pochtani sinxronlash uchun parvoz rejimini o‘chiring."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Ovozli pochtani tekshirish uchun mobil internet yoqilgan bo‘lishi lozim."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Ovozli pochtani tekshirish uchun mobil internet yoqilgan bo‘lishi lozim."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizual ovozli pochtani faollashtirib bo‘lmadi"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Ovozli pochtani qo‘ng‘iroq qilib ham tekshirishingiz mumkin."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizual ovozli pochtani yangilab bo‘lmadi"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fi tarmog‘iga ulanish imkoni paydo bo‘lganda yoki mobil internet sifati yaxshilanganda qayta urinib ko‘ring. Ovozli pochtani qo‘ng‘iroq qilib ham tekshirishingiz mumkin."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Mobil internet sifati yaxshilanganda qayta urinib ko‘ring. Ovozli pochtani qo‘ng‘iroq qilib ham tekshirishingiz mumkin."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Tezkor Wi-Fi yoki mobil internetdan foydalanish imkoniyati paydo bo‘lganida, qayta urinib ko‘ring. Ovozli pochtani uyali qo‘ng‘iroq orqali ham tekshirish mumkin."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Tezkor mobil internetdan foydalanish imkoniyati paydo bo‘lganida, qayta urinib ko‘ring. Ovozli pochtani uyali qo‘ng‘iroq orqali ham tekshirish mumkin."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizual ovozli pochtani yangilab bo‘lmadi"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Ovozli pochtani qo‘ng‘iroq qilib ham tekshirishingiz mumkin."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizual ovozli pochtani yangilab bo‘lmadi"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Noma’lum xatolik yuz berdi"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami orqali mijozlarni qo‘llab-quvvatlash markazi bilan bog‘laning va ularga xatolik kodi haqida xabar bering (kod: 9999)."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vizual ovozli pochtadan foydalanish shartlari"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Vizual ovozli pochtadan foydalanish uchun Verizon Wireless xizmatidan foydalanish shartlarini qabul qilish lozim: \n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVizual ovozli pochtadan foydalanish uchun Verizon Wireless xizmatidan foydalanish shartlarini qabul qilish lozim:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Vizual ovozli pochtani yoqish"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Agar foydalanish shartlari qabul qilinmasa, vizual ovozli pochta o‘chirib qo‘yiladi."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Vizual ovozli pochta o‘chirib qo‘yilsin"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Agar Foydalanish shartlari qabul qilinmasa, ovozli xabarlarni transkripsiyalash xizmati o‘chirib qo‘yiladi."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Ovozli xabarlarni transkripsiyalash xususiyatini o‘chirib qo‘yish"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Ovozli pochta xabarlarini *86 raqamiga qo‘ng‘iroq qilib tinglash mumkin. Davom ettirish uchun ovozli pochtaga yangi PIN kod o‘rnating."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN kod o‘rnatish"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml
index 029396e..895cf48 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Đang kích hoạt thư thoại kèm theo hình ảnh"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Bạn có thể không nhận được thông báo thư thoại cho đến khi thư thoại kèm theo hình ảnh được kích hoạt hoàn toàn. Gọi thư thoại để truy xuất tin nhắn mới cho đến khi thư thoại được kích hoạt hoàn toàn."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Không kích hoạt được thư thoại kèm theo hình ảnh"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Đảm bảo điện thoại của bạn có kết nối di động và thử lại."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Đảm bảo điện thoại của bạn có kết nối mạng di động và thử lại."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Hãy tắt chế độ trên máy bay và thử lại."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Không có kết nối"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Bạn sẽ không được thông báo về thư thoại mới. Nếu đang dùng Wi-Fi, bạn có thể kiểm tra thư thoại bằng cách đồng bộ hóa ngay bây giờ."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Bạn sẽ không được thông báo về thư thoại mới. Nếu đang dùng Wi-Fi, bạn có thể kiểm tra thư thoại bằng cách đồng bộ hóa ngay bây giờ."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Bạn sẽ không được thông báo về thư thoại mới. Hãy tắt chế độ trên máy bay để đồng bộ hóa thư thoại của bạn."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Điện thoại của bạn cần kết nối dữ liệu di động để kiểm tra thư thoại."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Điện thoại của bạn cần kết nối dữ liệu di động để kiểm tra thư thoại."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Không kích hoạt được thư thoại kèm theo hình ảnh"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Không cập nhật được thư thoại kèm theo hình ảnh"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Hãy thử lại khi Wi-Fi hoặc kết nối di động của bạn tốt hơn. Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Hãy thử lại khi kết nối dữ liệu di động của bạn tốt hơn. Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Hãy thử lại khi Wi-Fi hoặc kết nối dữ liệu di động của bạn tốt hơn. Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Hãy thử lại khi kết nối dữ liệu di động của bạn tốt hơn. Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Không cập nhật được thư thoại kèm theo hình ảnh"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Không cập nhật được thư thoại kèm theo hình ảnh"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Đã xảy ra lỗi"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số <xliff:g id="NUMBER">%1$s</xliff:g> và cho họ biết mã lỗi là 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Điều khoản và điều kiện của thư thoại kèm theo hình ảnh"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Bạn phải chấp nhận điều khoản và điều kiện của Verizon Wireless để sử dụng thư thoại kèm theo hình ảnh:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nBạn phải chấp nhận điều khoản và điều kiện của Verizon Wireless để sử dụng thư thoại kèm theo hình ảnh:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Bật Thư thoại kèm theo hình ảnh"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Thư thoại kèm theo hình ảnh sẽ bị tắt nếu điều khoản và điều kiện bị từ chối."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Tắt thư thoại kèm theo hình ảnh"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ghi âm thư thoại sẽ bị vô hiệu hóa nếu bạn từ chối điều khoản và điều kiện."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Vô hiệu hóa ghi âm thư thoại"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Bạn chỉ có thể truy cập thư thoại bằng cách gọi *86. Hãy đặt mã PIN thư thoại mới để tiếp tục."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Đặt mã PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml
index faa36de..deb0185 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"正在激活可视语音信箱"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"在可视语音信箱未完全激活前，您可能不会收到新语音邮件通知。在完全激活前，请呼叫语音信箱以获取新邮件。"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"无法激活可视语音信箱"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"请确保您的手机已连接到移动网络，然后重试。"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"请确保您的手机已连接到移动网络，然后重试。"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"请关闭飞行模式，然后重试。"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"无网络连接"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"您将不会收到关于新语音邮件的通知。如果您已连接到 WLAN 网络，则可以立即同步以便查看语音邮件。"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"您将不会收到关于新语音邮件的通知。如果您已连接到 WLAN 网络，则可以立即同步以便查看语音邮件。"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"您将不会收到关于新语音邮件的通知。请关闭飞行模式以便同步语音信箱。"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"要查看语音邮件，您的手机需要连接到移动数据网络。"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"要查看语音邮件，您的手机需要连接到移动数据网络。"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"无法激活可视语音信箱"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"您仍然可以通过拨打电话来查看语音邮件。"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"无法更新可视语音信箱"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"请在 WLAN 或移动网络连接信号较强时重试。您仍然可以通过拨打电话来查看语音邮件。"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"请在移动数据网络连接信号较强时重试。您仍然可以通过拨打电话来查看语音邮件。"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"请在 WLAN 或移动网络连接信号较强时重试。您仍然可以通过拨打电话来查看语音邮件。"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"请在移动数据网络连接信号较强时重试。您仍然可以通过拨打电话来查看语音邮件。"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"无法更新可视语音信箱"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"您仍然可以通过拨打电话来查看语音邮件。"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"无法更新可视语音信箱"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"出了点问题"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"请拨打 <xliff:g id="NUMBER">%1$s</xliff:g> 联系客户服务人员，并告诉他们错误代码是 9999。"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"可视语音信箱条款及条件"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"您必须接受 Verizon Wireless 的条款及条件，才能使用可视语音信箱：\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\n您必须接受 Verizon Wireless 的条款及条件才能使用可视语音信箱：\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"启用可视语音信箱"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"如果您拒绝接受条款及条件，可视语音信箱将被停用。"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"停用可视语音信箱"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"如果您拒绝接受条款及条件，语音邮件转录功能将被停用。"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"停用语音邮件转录功能"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"您只能通过拨打 *86 来访问语音信箱。请先设置新的语音信箱 PIN 码再继续操作。"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"设置 PIN 码"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml
index e51a0a9..add6d1a 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"正在啟用視像留言"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"視像留言完全啟用前，您可能無法接收留言通知。請致電留言信箱以取得新訊息，直至視像留言完全啟用。"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"無法啟用視像留言"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"請確定您的手機有數據連線，然後再試一次。"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"請確定您的手機有數據連線，然後再試一次。"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"關閉飛行模式，然後再試一次。"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"沒有連線"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"您不會收到新留言通知。如果您使用的是 Wi-Fi，可以立即透過同步處理的方式查看是否有留言。"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"您不會收到新留言通知。如果您使用的是 Wi-Fi，可以立即透過同步處理的方式查看是否有留言。"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"您不會收到新留言通知。請關閉飛行模式，以便同步處理留言信箱。"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"您的手機需要有流動數據連線，才能查看留言信箱。"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"您的手機需要有流動數據連線，才能查看留言。"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"無法啟用視像留言"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"您仍可撥號以查看留言信箱。"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"無法更新視像留言信箱"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"請在您的 Wi-Fi 或數據連線品質較佳時再試一次。您仍可撥號以查看留言信箱。"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"請在您的數據連線品質較佳時再試一次。您仍可撥號以查看留言信箱。"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"請在您的 Wi-Fi 或數據連線品質較佳時再試一次。您仍可撥號以查看留言。"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"請在您的數據連線品質較佳時再試一次。您仍可撥號以查看留言。"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"無法更新視像留言信箱"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"您仍可撥號以查看留言信箱。"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"無法更新視像留言信箱"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"發生問題"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"請致電 <xliff:g id="NUMBER">%1$s</xliff:g> 聯絡客戶服務，並提供錯誤代碼 9999。"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"視像留言條款及細則"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"您必須接受 Verizon Wireless 的條款及細則，才能使用視像留言：\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\n您必須接受 Verizon Wireless 條款及細則，才能使用視像留言：\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"啟用視像留言"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"如果拒絕條款及細則，視像留言將會停用。"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"停用視像留言"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"如果拒絕條款及細則，留言轉錄功能將會停用。"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"停用留言轉錄功能"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"您只可以撥打 *86 使用留言信箱。請先設定新留言信箱 PIN 碼，然後繼續。"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"設定 PIN 碼"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml
index 7f2e1d6..5937bb1 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"啟用視覺化語音信箱"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"您必須完整啟用視覺化語音信箱，才會收到語音留言通知。在未完整啟用這項功能之前，如要擷取新訊息，請撥打語音信箱號碼。"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"無法啟用視覺化語音信箱"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"請確定您的手機能收到訊號，然後再試一次。"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"請確認你的手機已連上行動網路，然後再試一次。"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"請關閉飛航模式，然後再試一次。"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"沒有訊號"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"您不會收到新的語音留言通知。如果您已連上 Wi-Fi，立即執行同步處理，就能檢查是否有語音留言。"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"你不會收到新的語音留言通知。如果你已連上 Wi-Fi 網路，立即執行同步處理就能檢查是否有語音留言。"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"您不會收到新的語音留言通知。請關閉飛航模式，以便同步處理語音留言。"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"手機必須要有數據連線才能檢查語音留言。"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"手機必須要有行動數據連線才能檢查語音留言。"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"無法啟用視覺化語音信箱"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"您也可以撥打電話來檢查語音留言。"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"無法更新視覺化語音信箱"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"請在 Wi-Fi 連線品質較佳或手機訊號較強時再試一次。您也可以撥打電話來檢查語音留言。"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"請在數據連線品質較佳時再試一次。您也可以撥打電話來檢查語音留言。"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"請在 Wi‑Fi 或行動網路連線品質較佳時再試一次。你還是可以撥打電話來檢查語音留言。"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"請在行動網路連線品質較佳時再試一次。你還是可以撥打電話來檢查語音留言。"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"無法更新視覺化語音信箱"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"您也可以撥打電話來檢查語音留言。"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"無法更新視覺化語音信箱"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"發生錯誤"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"請撥打 <xliff:g id="NUMBER">%1$s</xliff:g> 與客服人員聯絡，並告訴對方錯誤代碼為 9999。"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"視覺化語音信箱條款及細則"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"你必須接受 Verizon Wireless 的條款及細則，才能使用視覺化語音信箱：\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\n你必須接受 Verizon Wireless 的條款及細則才能使用視覺化語音信箱：\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"啟用視覺化語音信箱"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"如果你拒絕接受相關條款及細則，系統將停用視覺化語音信箱功能。"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"停用視覺化語音信箱"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"如果拒絕接受條款及細則，系統將停用語音信箱留言轉錄功能。"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"停用語音信箱留言轉錄"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"必須撥打 *86 才能聽取語音信箱。如要繼續進行，請先設定新的語音信箱密碼。"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"設定語音信箱密碼"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml
index 8d3cd79..5b31e3a 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml
@@ -21,17 +21,17 @@
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Yenza kusebenze ivoyisimeyili ebonakalayo"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Kungenzeka ungatholi izaziso zevoyisimeyili kuze kwenziwe kusebenze ngokugcwele ivoyisimeyili ebonakalayo. Shayela ivoyisimeyili ukuze uthole imilayezo emisha kuze kwenziwe kusebenze ngokugcwele ivoyisimeyili."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Ayikwazi ukwenza kusebenze ivoyisimeyili ebonakalayo"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Qiniseka ukuthi ifoni yakho inokuxhumeka kweselula uphinde uzame futhi."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Qiniseka ukuthi ifoni yakho inoxhumo lenethiwekhi leselula bese uyazama futhi."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Vala imodi yendiza uphinde uzame futhi."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Akukho ukuxhumana"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Ngeke uze waziswe ngamavoyisimeyili amasha. Uma uku-Wi-Fi, ungahlolela ivoyisimeyili ngokuvumelanisa manje."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Ngeke uze waziswe ngamavoyisimeyili amasha. Uma uku-Wi-Fi, ungahlolela ivoyisimeyili ngokuvumelanisa manje."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Ngeke waziswe ngamavoyisimeyili amasha. Vala imodi yendiza ukuze uvumelanise ivoyisimeyili yakho."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Ifoni yakho idinga ukuxhumeka kwedatha yeselula ukuze ihlole ivoyisimeyili."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Ifoni yakho idinga ukuxhumeka kwedatha yeselula ukuze ihlole ivoyisimeyili."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Ayikwazi ukwenza kusebenze ivoyisimeyili ebonakalayo"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Usengashaya ukuze uhlole ivoyisimeyili"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Zama futhi uma i-Wi-Fi yakho noma ukuxhumeka kwakho kweselula kungcono. Usengashaya ukuze uhlole ivoyisimeyili."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Zama futhi uma ukuxhumeka kwakho kweselula sekungcono. Usengashaya ukuze uhlole ivoyisimeyili."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Zama futhi uma i-Wi-Fi yakho noma ukuxhumeka kwakho kwedatha kungcono. Usengashaya ukuze uhlole ivoyisimeyili."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Zama futhi uma ukuxhumeka kwakho kwedaha sekungcono. Usengashaya ukuze uhlole ivoyisimeyili."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Usengashaya ukuze uhlole ivoyisimeyili"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo"</string>
@@ -102,9 +102,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Kukhona okungahambanga kahle"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Sicela uxhumane Nesevisi Yekhasimende ku-<xliff:g id="NUMBER">%1$s</xliff:g> uphinde ubatshele ukuthi ikhodi yephutha ngu-9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Imigomo nemibandela ye-Visual Voicemail"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Kufanele wamukele imigomo nemibandela ye-Verizon Wireless ukuze usebenzise i-visual voicemail:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nKufanele wamukele imogomo nemibandela ye-Verizon Wireless ukuze usebenzise ivoyisimeyili yokubuka:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Vula ivoyisimeyili yokubuka"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"I-Visual voicemail izokhutshazwa uma imigomo nemibandela inqatshawa."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Khubaza i-visual voicemail"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ukubhalwa kweviyisimeyili kuizokhutshazwa uma imigomo nemibandela inqatshawa."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Khuyaza ukubhalwa kwevoyisimeyili"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Ivoyisimeyili izofinyeleleka kuphela ngokushayela ku-*86. Setha iphinikhodi entsha yevoyisimeyili ukuze uqhubeke."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Setha iphinikhodi"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml
index 94d3dba..ad5240b 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml
@@ -21,20 +21,20 @@
   <string name="voicemail_error_activating_message">You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated.</string>
 
   <string name="voicemail_error_not_activate_no_signal_title">Can\'t activate visual voicemail</string>
-  <string name="voicemail_error_not_activate_no_signal_message">Make sure your phone has cellular connection and try again.</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Make sure your phone has a mobile network connection and try again.</string>
   <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Turn off airplane mode and try again.</string>
 
   <string name="voicemail_error_no_signal_title">No connection</string>
-  <string name="voicemail_error_no_signal_message">You won\'t be notified for new voicemails. If you\'re on Wi-Fi, you can check for voicemail by syncing now.</string>
+  <string name="voicemail_error_no_signal_message">You won\'t be notified for new voicemails. If you\'re on Wi\u2011Fi, you can check for voicemail by syncing now.</string>
   <string name="voicemail_error_no_signal_airplane_mode_message">You won\'t be notified for new voicemails. Turn off airplane mode to sync your voicemail.</string>
-  <string name="voicemail_error_no_signal_cellular_required_message">Your phone needs a cellular data connection to check voicemail.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Your phone needs a mobile data connection to check voicemail.</string>
 
   <string name="voicemail_error_activation_failed_title">Can\'t activate visual voicemail</string>
   <string name="voicemail_error_activation_failed_message">You can still call to check voicemail.</string>
 
   <string name="voicemail_error_no_data_title">Can\'t update visual voicemail</string>
-  <string name="voicemail_error_no_data_message">Try again when your Wi-Fi or cellular connection is better. You can still call to check voicemail.</string>
-  <string name="voicemail_error_no_data_cellular_required_message">Try again when your cellular data connection is better. You can still call to check voicemail.</string>
+  <string name="voicemail_error_no_data_message">Try again when your Wi\u2011Fi or mobile data connection is better. You can still call to check voicemail.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Try again when your mobile data connection is better. You can still call to check voicemail.</string>
 
   <string name="voicemail_error_bad_config_title">Can\'t update visual voicemail</string>
   <string name="voicemail_error_bad_config_message">You can still call to check voicemail.</string>
@@ -141,7 +141,10 @@
   <string translatable="false" name="verizon_domestic_customer_support_display_number">(800) 922–0204</string>
 
   <string name="verizon_terms_and_conditions_title">Visual Voicemail Terms and Conditions</string>
-  <string name="verizon_terms_and_conditions_message">You must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%s</string>
+  <string name="verizon_terms_and_conditions_message">%1$s\n\nYou must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%2$s</string>
+
+  <string name="dialer_terms_and_conditions_title">Turn on Visual Voicemail</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
 
   <string translatable="false" name="verizon_terms_and_conditions_1.1_english">
 Visual Voice Mail (VVM) is a service that provides access to voice mail messages directly on the device, without the need to call *86. This service requires traditional Voice Mail but does not support all traditional Voice Mail features, which you can access by dialing *86 from your handset. Use of this feature will be billed on a per-megabyte basis, or according to any data package you have. Mobile to mobile minutes do not apply. Standard rates apply to any calls, emails or messages initiated from Visual Voice Mail.\n
@@ -152,7 +155,7 @@
 \n
 Speech recordings may be collected and stored for a period of 30 days, solely for the purpose of testing and improving transcription technology and performance, subject to the Verizon Wireless Privacy Policy, which can be found at http://www.verizon.com/about/privacy/policy/\n
 \n
-You understand that by selecting ACCEPT, your messages will be stored and anyone in possession of this device will have access to your voice mail. You further understand that your voice mail messages may be stored in electronic format on this device. To limit unauthorized access to your voice mail, you should consider locking your phone when not in use. Not available in all areas or over Wi-Fi.\n
+You understand that by selecting ACCEPT, your messages will be stored and anyone in possession of this device will have access to your voice mail. You further understand that your voice mail messages may be stored in electronic format on this device. To limit unauthorized access to your voice mail, you should consider locking your phone when not in use. Not available in all areas or over Wi\u2011Fi.\n
 \n
 If you do not accept all of these terms and conditions, do not use Visual Voice Mail.  </string>
 
@@ -165,19 +168,35 @@
 \n
 Es posible que reunamos y almacenemos grabaciones de voz durante 30 días, con el único fin de probar y mejorar el rendimiento y la tecnología de la transcripción, sujeto a la Política de privacidad de Verizon Wireless, disponible en http://www.verizon.com/about/privacy/policy/.\n
 \n
-Entiende que, al seleccionar ACEPTAR, sus mensajes se almacenarán, y cualquier persona que disponga de este dispositivo tendrá acceso al buzón de voz. Entiende, además, que los mensajes de voz pueden almacenarse en formato electrónico en este dispositivo. Para limitar el acceso no autorizado al buzón de voz, debe considerar el bloqueo del teléfono cuando no está en uso. No está disponible en todas las áreas ni mediante Wi-Fi.\n
+Entiende que, al seleccionar ACEPTAR, sus mensajes se almacenarán, y cualquier persona que disponga de este dispositivo tendrá acceso al buzón de voz. Entiende, además, que los mensajes de voz pueden almacenarse en formato electrónico en este dispositivo. Para limitar el acceso no autorizado al buzón de voz, debe considerar el bloqueo del teléfono cuando no está en uso. No está disponible en todas las áreas ni mediante Wi\u2011Fi.\n
 \n
 Si no acepta todos estos términos y condiciones, no use el buzón de voz visual.
   </string>
 
+  <string translatable="false" name="dialer_terms_and_conditions_1.0_english">
+  See and listen to your messages, without having to call voicemail.\n\nGet transcripts of your voicemail using Google’s transcription service.
+  </string>
+
+  <string translatable="false" name="dialer_terms_and_conditions_1.0_spanish">
+  ***TRANSLATE TO SPANISH***\nSee and listen to your messages, without having to call voicemail.\n\nGet transcripts of your voicemail using Google’s transcription service.
+  </string>
+
   <string translatable="false" name="verizon_terms_and_conditions_accept_english">Accept</string>
   <string translatable="false" name="verizon_terms_and_conditions_accept_spanish">Aceptar</string>
   <string translatable="false" name="verizon_terms_and_conditions_decline_english">Decline</string>
   <string translatable="false" name="verizon_terms_and_conditions_decline_spanish">Rechazar</string>
 
+  <string translatable="false" name="dialer_terms_and_conditions_accept_english">Turn On</string>
+  <string translatable="false" name="dialer_terms_and_conditions_accept_spanish">Aceptar</string>
+  <string translatable="false" name="dialer_terms_and_conditions_decline_english">No Thanks</string>
+  <string translatable="false" name="dialer_terms_and_conditions_decline_spanish">Rechazar</string>
+
   <string name="verizon_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if the terms and conditions are declined.</string>
   <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Disable visual voicemail</string>
 
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Voicemail transcription will be disabled if the terms and conditions are declined.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Disable voicemail transcription</string>
+
   <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed.</string>
   <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Set PIN</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/app/widget/SearchEditTextLayout.java b/java/com/android/dialer/app/widget/SearchEditTextLayout.java
index d67fd9e..95bd12a 100644
--- a/java/com/android/dialer/app/widget/SearchEditTextLayout.java
+++ b/java/com/android/dialer/app/widget/SearchEditTextLayout.java
@@ -91,7 +91,7 @@
     mBackButtonView = findViewById(R.id.search_back_button);
     mBackButtonView
         .getResources()
-        .getDrawable(R.drawable.quantum_ic_arrow_back_vd_theme_24)
+        .getDrawable(R.drawable.quantum_ic_arrow_back_vd_theme_24, null)
         .setAutoMirrored(true);
     mClearButtonView = findViewById(R.id.search_close_button);
 
diff --git a/java/com/android/dialer/backup/DialerBackupAgent.java b/java/com/android/dialer/backup/DialerBackupAgent.java
index dec1ca1..40de8e2 100644
--- a/java/com/android/dialer/backup/DialerBackupAgent.java
+++ b/java/com/android/dialer/backup/DialerBackupAgent.java
@@ -34,8 +34,8 @@
 import android.telecom.PhoneAccountHandle;
 import android.util.Pair;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.telecom.TelecomUtil;
diff --git a/java/com/android/dialer/backup/DialerBackupUtils.java b/java/com/android/dialer/backup/DialerBackupUtils.java
index 17e82e4..fe714f6 100644
--- a/java/com/android/dialer/backup/DialerBackupUtils.java
+++ b/java/com/android/dialer/backup/DialerBackupUtils.java
@@ -31,8 +31,8 @@
 import android.telecom.TelecomManager;
 import android.util.Pair;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.voicemail.VoicemailComponent;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Files;
diff --git a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
index bc0b39b..6a7c588 100644
--- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
+++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
@@ -19,6 +19,7 @@
 import com.android.dialer.binary.basecomponent.BaseDialerRootComponent;
 import com.android.dialer.calllog.CallLogModule;
 import com.android.dialer.common.concurrent.DialerExecutorModule;
+import com.android.dialer.configprovider.SharedPrefConfigProviderModule;
 import com.android.dialer.enrichedcall.stub.StubEnrichedCallModule;
 import com.android.dialer.inject.ContextModule;
 import com.android.dialer.lightbringer.stub.StubLightbringerModule;
@@ -36,6 +37,7 @@
     CallLogModule.class,
     ContextModule.class,
     DialerExecutorModule.class,
+    SharedPrefConfigProviderModule.class,
     SimulatorModule.class,
     StubCallLocationModule.class,
     StubEnrichedCallModule.class,
diff --git a/java/com/android/dialer/binary/aosp/testing/AndroidManifest.xml b/java/com/android/dialer/binary/aosp/testing/AndroidManifest.xml
new file mode 100644
index 0000000..15870cb
--- /dev/null
+++ b/java/com/android/dialer/binary/aosp/testing/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ 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
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.binary.aosp.testing">
+
+  <application>
+    <activity android:name="com.android.dialer.binary.aosp.testing.TestActivity"/>
+  </application>
+
+</manifest>
diff --git a/java/com/android/dialer/common/ConfigProviderFactory.java b/java/com/android/dialer/binary/aosp/testing/TestActivity.java
similarity index 62%
rename from java/com/android/dialer/common/ConfigProviderFactory.java
rename to java/com/android/dialer/binary/aosp/testing/TestActivity.java
index aeb4f30..9cb26da 100644
--- a/java/com/android/dialer/common/ConfigProviderFactory.java
+++ b/java/com/android/dialer/binary/aosp/testing/TestActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -14,13 +14,12 @@
  * limitations under the License
  */
 
-package com.android.dialer.common;
+package com.android.dialer.binary.aosp.testing;
+
+import android.app.Activity;
 
 /**
- * This interface should be implementated by the Application subclass. It allows dialer code to get
- * references to a config provider.
+ * An empty Activity to use in tests. This can be useful when UI needs to be tested outside an
+ * Activity, either as a background or to keep the test framework running.
  */
-public interface ConfigProviderFactory {
-
-  ConfigProvider getConfigProvider();
-}
+public class TestActivity extends Activity {}
diff --git a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
index 6e6ae4b..8ac071f 100644
--- a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
+++ b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
@@ -19,8 +19,10 @@
 import com.android.dialer.calllog.CallLogComponent;
 import com.android.dialer.calllog.database.CallLogDatabaseComponent;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.lightbringer.LightbringerComponent;
+import com.android.dialer.main.MainComponent;
 import com.android.dialer.simulator.SimulatorComponent;
 import com.android.incallui.calllocation.CallLocationComponent;
 import com.android.incallui.maps.MapsComponent;
@@ -34,7 +36,9 @@
     extends CallLocationComponent.HasComponent,
         CallLogComponent.HasComponent,
         CallLogDatabaseComponent.HasComponent,
+        ConfigProviderComponent.HasComponent,
         DialerExecutorComponent.HasComponent,
+        MainComponent.HasComponent,
         EnrichedCallComponent.HasComponent,
         MapsComponent.HasComponent,
         SimulatorComponent.HasComponent,
diff --git a/java/com/android/dialer/binary/common/DialerApplication.java b/java/com/android/dialer/binary/common/DialerApplication.java
index 5037883..08666a2 100644
--- a/java/com/android/dialer/binary/common/DialerApplication.java
+++ b/java/com/android/dialer/binary/common/DialerApplication.java
@@ -20,6 +20,7 @@
 import android.os.StrictMode;
 import android.os.Trace;
 import android.support.annotation.NonNull;
+import android.support.v4.os.BuildCompat;
 import com.android.dialer.blocking.BlockedNumbersAutoMigrator;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.buildtype.BuildType;
@@ -49,7 +50,9 @@
     CallLogComponent.get(this).callLogFramework().registerContentObservers(getApplicationContext());
     PersistentLogger.initialize(this);
 
-    NotificationChannelManager.getInstance().firstInitIfNeeded(this);
+    if (BuildCompat.isAtLeastO()) {
+      NotificationChannelManager.initChannels(this);
+    }
     Trace.endSection();
   }
 
diff --git a/java/com/android/dialer/blocking/FilteredNumbersUtil.java b/java/com/android/dialer/blocking/FilteredNumbersUtil.java
index cdcf1f7..9e0c23c 100644
--- a/java/com/android/dialer/blocking/FilteredNumbersUtil.java
+++ b/java/com/android/dialer/blocking/FilteredNumbersUtil.java
@@ -27,6 +27,7 @@
 import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.os.BuildCompat;
 import android.support.v4.os.UserManagerCompat;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
@@ -35,8 +36,7 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.notification.NotificationChannelId;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.PermissionsUtil;
 import java.util.concurrent.TimeUnit;
@@ -45,8 +45,7 @@
 public class FilteredNumbersUtil {
 
   public static final String CALL_BLOCKING_NOTIFICATION_TAG = "call_blocking";
-  public static final int CALL_BLOCKING_DISABLED_BY_EMERGENCY_CALL_NOTIFICATION_ID =
-      R.id.notification_call_blocking_disabled_by_emergency_call;
+  public static final int CALL_BLOCKING_DISABLED_BY_EMERGENCY_CALL_NOTIFICATION_ID = 10;
   // Pref key for storing the time of end of the last emergency call in milliseconds after epoch.\
   @VisibleForTesting
   public static final String LAST_EMERGENCY_CALL_MS_PREF_KEY = "last_emergency_call_ms";
@@ -254,7 +253,9 @@
                         context.getString(R.string.call_blocking_disabled_notification_text))
                     .setAutoCancel(true);
 
-            NotificationChannelManager.applyChannel(builder, context, Channel.DEFAULT, null);
+            if (BuildCompat.isAtLeastO()) {
+              builder.setChannelId(NotificationChannelId.DEFAULT);
+            }
             builder.setContentIntent(
                 PendingIntent.getActivity(
                     context,
diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java
index bc20c73..63d29b5 100644
--- a/java/com/android/dialer/callcomposer/CallComposerActivity.java
+++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java
@@ -26,10 +26,11 @@
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.FileProvider;
-import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.support.v7.app.AppCompatActivity;
@@ -42,6 +43,7 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.QuickContactBadge;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -53,6 +55,8 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.UiUtil;
 import com.android.dialer.common.concurrent.DialerExecutors;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
@@ -67,6 +71,7 @@
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.ViewUtil;
 import com.android.dialer.widget.DialerToolbar;
+import com.android.dialer.widget.LockableViewPager;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.io.File;
 
@@ -96,10 +101,18 @@
   private static final String ARG_CALL_COMPOSER_CONTACT_BASE64 = "CALL_COMPOSER_CONTACT_BASE64";
 
   private static final String ENTRANCE_ANIMATION_KEY = "entrance_animation_key";
+  private static final String SEND_AND_CALL_READY_KEY = "send_and_call_ready_key";
   private static final String CURRENT_INDEX_KEY = "current_index_key";
   private static final String VIEW_PAGER_STATE_KEY = "view_pager_state_key";
   private static final String SESSION_ID_KEY = "session_id_key";
 
+  private final Handler timeoutHandler = ThreadUtil.getUiThreadHandler();
+  private final Runnable sessionStartedTimedOut =
+      () -> {
+        LogUtil.i("CallComposerActivity.sessionStartedTimedOutRunnable", "session never started");
+        setFailedResultAndFinish();
+      };
+
   private DialerContact contact;
   private Long sessionId = Session.NO_SESSION_ID;
 
@@ -111,10 +124,11 @@
   private View sendAndCall;
   private TextView sendAndCallText;
 
+  private ProgressBar loading;
   private ImageView cameraIcon;
   private ImageView galleryIcon;
   private ImageView messageIcon;
-  private ViewPager pager;
+  private LockableViewPager pager;
   private CallComposerPagerAdapter adapter;
 
   private FrameLayout background;
@@ -124,6 +138,7 @@
   private boolean shouldAnimateEntrance = true;
   private boolean inFullscreenMode;
   private boolean isSendAndCallHidingOrHidden = true;
+  private boolean sendAndCallReady;
   private int currentIndex;
 
   public static Intent newIntent(Context context, DialerContact contact) {
@@ -150,6 +165,7 @@
     toolbar = findViewById(R.id.toolbar);
     sendAndCall = findViewById(R.id.send_and_call_button);
     sendAndCallText = findViewById(R.id.send_and_call_text);
+    loading = findViewById(R.id.call_composer_loading);
 
     interpolator = new FastOutSlowInInterpolator();
     adapter =
@@ -168,6 +184,7 @@
 
     if (savedInstanceState != null) {
       shouldAnimateEntrance = savedInstanceState.getBoolean(ENTRANCE_ANIMATION_KEY);
+      sendAndCallReady = savedInstanceState.getBoolean(SEND_AND_CALL_READY_KEY);
       pager.onRestoreInstanceState(savedInstanceState.getParcelable(VIEW_PAGER_STATE_KEY));
       currentIndex = savedInstanceState.getInt(CURRENT_INDEX_KEY);
       sessionId = savedInstanceState.getLong(SESSION_ID_KEY, Session.NO_SESSION_ID);
@@ -212,6 +229,7 @@
   protected void onPause() {
     super.onPause();
     getEnrichedCallManager().unregisterStateChangedListener(this);
+    timeoutHandler.removeCallbacks(sessionStartedTimedOut);
   }
 
   @Override
@@ -231,12 +249,36 @@
         "state: %s",
         StateExtension.toString(state));
 
-    if (state == EnrichedCallManager.STATE_START_FAILED
-        || state == EnrichedCallManager.STATE_CLOSED) {
-      setFailedResultAndFinish();
+    switch (state) {
+      case EnrichedCallManager.STATE_STARTING:
+        timeoutHandler.postDelayed(sessionStartedTimedOut, getSessionStartedTimeoutMillis());
+        if (sendAndCallReady) {
+          showLoadingUi();
+        }
+        break;
+      case EnrichedCallManager.STATE_STARTED:
+        timeoutHandler.removeCallbacks(sessionStartedTimedOut);
+        if (sendAndCallReady) {
+          sendAndCall();
+        }
+        break;
+      case EnrichedCallManager.STATE_START_FAILED:
+      case EnrichedCallManager.STATE_CLOSED:
+        setFailedResultAndFinish();
+        break;
+      case EnrichedCallManager.STATE_MESSAGE_FAILED:
+      case EnrichedCallManager.STATE_MESSAGE_SENT:
+      case EnrichedCallManager.STATE_NONE:
+      default:
+        break;
     }
   }
 
+  @VisibleForTesting
+  public long getSessionStartedTimeoutMillis() {
+    return ConfigProviderBindings.get(this).getLong("ec_session_started_timeout", 10_000);
+  }
+
   @Override
   protected void onNewIntent(Intent intent) {
     super.onNewIntent(intent);
@@ -262,6 +304,8 @@
   @Override
   public void sendAndCall() {
     if (!sessionReady()) {
+      sendAndCallReady = true;
+      showLoadingUi();
       LogUtil.i("CallComposerActivity.onClick", "sendAndCall pressed, but the session isn't ready");
       Logger.get(this)
           .logImpression(
@@ -329,6 +373,11 @@
     }
   }
 
+  private void showLoadingUi() {
+    loading.setVisibility(View.VISIBLE);
+    pager.setSwipingLocked(true);
+  }
+
   private boolean sessionReady() {
     Session session = getEnrichedCallManager().getSession(sessionId);
     return session != null && session.getState() == EnrichedCallManager.STATE_STARTED;
@@ -363,10 +412,6 @@
     }
     if (currentIndex == CallComposerPagerAdapter.INDEX_MESSAGE) {
       UiUtil.hideKeyboardFrom(this, windowContainer);
-    } else if (position == CallComposerPagerAdapter.INDEX_MESSAGE
-        && inFullscreenMode
-        && !isLandscapeLayout()) {
-      UiUtil.openKeyboardFrom(this, windowContainer);
     }
     currentIndex = position;
     CallComposerFragment fragment = (CallComposerFragment) adapter.instantiateItem(pager, position);
@@ -385,6 +430,7 @@
     super.onSaveInstanceState(outState);
     outState.putParcelable(VIEW_PAGER_STATE_KEY, pager.onSaveInstanceState());
     outState.putBoolean(ENTRANCE_ANIMATION_KEY, shouldAnimateEntrance);
+    outState.putBoolean(SEND_AND_CALL_READY_KEY, sendAndCallReady);
     outState.putInt(CURRENT_INDEX_KEY, currentIndex);
     outState.putLong(SESSION_ID_KEY, sessionId);
   }
diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
index ecdc258..1002b27 100644
--- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
@@ -91,17 +91,17 @@
       LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle bundle) {
     View root = inflater.inflate(R.layout.fragment_camera_composer, container, false);
     permissionView = root.findViewById(R.id.permission_view);
-    loading = (ProgressBar) root.findViewById(R.id.loading);
-    cameraView = (CameraMediaChooserView) root.findViewById(R.id.camera_view);
+    loading = root.findViewById(R.id.loading);
+    cameraView = root.findViewById(R.id.camera_view);
     shutter = cameraView.findViewById(R.id.camera_shutter_visual);
-    exitFullscreen = (ImageButton) cameraView.findViewById(R.id.camera_exit_fullscreen);
-    fullscreen = (ImageButton) cameraView.findViewById(R.id.camera_fullscreen);
-    swapCamera = (ImageButton) cameraView.findViewById(R.id.swap_camera_button);
-    capture = (ImageButton) cameraView.findViewById(R.id.camera_capture_button);
-    cancel = (ImageButton) cameraView.findViewById(R.id.camera_cancel_button);
-    focus = (RenderOverlay) cameraView.findViewById(R.id.focus_visual);
-    preview = (CameraPreviewHost) cameraView.findViewById(R.id.camera_preview);
-    previewImageView = (ImageView) root.findViewById(R.id.preview_image_view);
+    exitFullscreen = cameraView.findViewById(R.id.camera_exit_fullscreen);
+    fullscreen = cameraView.findViewById(R.id.camera_fullscreen);
+    swapCamera = cameraView.findViewById(R.id.swap_camera_button);
+    capture = cameraView.findViewById(R.id.camera_capture_button);
+    cancel = cameraView.findViewById(R.id.camera_cancel_button);
+    focus = cameraView.findViewById(R.id.focus_visual);
+    preview = cameraView.findViewById(R.id.camera_preview);
+    previewImageView = root.findViewById(R.id.preview_image_view);
 
     exitFullscreen.setOnClickListener(this);
     fullscreen.setOnClickListener(this);
@@ -113,8 +113,8 @@
     if (!PermissionsUtil.hasCameraPermissions(getContext())) {
       LogUtil.i("CameraComposerFragment.onCreateView", "Permission view shown.");
       Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_DISPLAYED);
-      ImageView permissionImage = (ImageView) permissionView.findViewById(R.id.permission_icon);
-      TextView permissionText = (TextView) permissionView.findViewById(R.id.permission_text);
+      ImageView permissionImage = permissionView.findViewById(R.id.permission_icon);
+      TextView permissionText = permissionView.findViewById(R.id.permission_text);
       allowPermission = permissionView.findViewById(R.id.allow);
 
       allowPermission.setOnClickListener(this);
@@ -345,6 +345,12 @@
       previewImageView.setVisibility(View.GONE);
     }
 
+    if (cameraDirection == CameraInfo.CAMERA_FACING_FRONT) {
+      swapCamera.setContentDescription(getString(R.string.description_camera_switch_camera_rear));
+    } else {
+      swapCamera.setContentDescription(getString(R.string.description_camera_switch_camera_facing));
+    }
+
     if (cameraUri == null && isCameraAvailable) {
       CameraManager.get().resetPreview();
       cancel.setVisibility(View.GONE);
diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java
index 977f063..5915ce3 100644
--- a/java/com/android/dialer/callcomposer/camera/CameraManager.java
+++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java
@@ -509,54 +509,61 @@
     }.execute();
   }
 
-  /** Updates the orientation of the camera to match the orientation of the device */
-  private void updateCameraOrientation() {
-    if (mCamera == null || mCameraPreview == null || mTakingPicture) {
-      return;
+  /**
+   * Updates the orientation of the {@link Camera} w.r.t. the orientation of the device and the
+   * orientation that the physical camera is mounted on the device.
+   *
+   * @param camera that needs to be reorientated
+   * @param screenRotation rotation of the physical device
+   * @param cameraOrientation {@link CameraInfo#orientation}
+   * @param cameraIsFrontFacing {@link CameraInfo#CAMERA_FACING_FRONT}
+   * @return rotation that images returned from {@link
+   *     android.hardware.Camera.PictureCallback#onPictureTaken(byte[], Camera)} will be rotated.
+   */
+  @VisibleForTesting
+  static int updateCameraRotation(
+      @NonNull Camera camera,
+      int screenRotation,
+      int cameraOrientation,
+      boolean cameraIsFrontFacing) {
+    Assert.isNotNull(camera);
+    Assert.checkArgument(cameraOrientation % 90 == 0);
+
+    int rotation = screenRotationToDegress(screenRotation);
+    boolean portrait = rotation == 0 || rotation == 180;
+
+    if (!portrait && !cameraIsFrontFacing) {
+      rotation += 180;
+    }
+    rotation += cameraOrientation;
+    rotation %= 360;
+
+    // Rotate the camera
+    if (portrait && cameraIsFrontFacing) {
+      camera.setDisplayOrientation((rotation + 180) % 360);
+    } else {
+      camera.setDisplayOrientation(rotation);
     }
 
-    final WindowManager windowManager =
-        (WindowManager) mCameraPreview.getContext().getSystemService(Context.WINDOW_SERVICE);
+    // Rotate the images returned when a picture is taken
+    Camera.Parameters params = camera.getParameters();
+    params.setRotation(rotation);
+    camera.setParameters(params);
+    return rotation;
+  }
 
-    int degrees;
-    switch (windowManager.getDefaultDisplay().getRotation()) {
+  private static int screenRotationToDegress(int screenRotation) {
+    switch (screenRotation) {
       case Surface.ROTATION_0:
-        degrees = 0;
-        mCamera.setDisplayOrientation(90);
-        break;
+        return 0;
       case Surface.ROTATION_90:
-        degrees = 90;
-        break;
+        return 90;
       case Surface.ROTATION_180:
-        degrees = 180;
-        break;
+        return 180;
       case Surface.ROTATION_270:
-        degrees = 270;
-        mCamera.setDisplayOrientation(180);
-        break;
+        return 270;
       default:
-        throw Assert.createAssertionFailException("");
-    }
-
-    // The clockwise rotation angle relative to the orientation of the camera. This affects
-    // pictures returned by the camera in Camera.PictureCallback.
-    if (mCameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-      mRotation = (mCameraInfo.orientation + degrees) % 360;
-    } else { // back-facing
-      mRotation = (mCameraInfo.orientation - degrees + 360) % 360;
-    }
-    try {
-      final Camera.Parameters params = mCamera.getParameters();
-      params.setRotation(mRotation);
-      mCamera.setParameters(params);
-    } catch (final RuntimeException e) {
-      LogUtil.e(
-          "CameraManager.updateCameraOrientation",
-          "RuntimeException in CameraManager.updateCameraOrientation",
-          e);
-      if (mListener != null) {
-        mListener.onCameraError(ERROR_OPENING_CAMERA, e);
-      }
+        throw Assert.createIllegalStateFailException("Invalid surface rotation.");
     }
   }
 
@@ -586,7 +593,14 @@
     }
     try {
       mCamera.stopPreview();
-      updateCameraOrientation();
+      if (!mTakingPicture) {
+        mRotation =
+            updateCameraRotation(
+                mCamera,
+                getScreenRotation(),
+                mCameraInfo.orientation,
+                mCameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT);
+      }
 
       final Camera.Parameters params = mCamera.getParameters();
       final Camera.Size pictureSize = chooseBestPictureSize();
@@ -635,6 +649,14 @@
     }
   }
 
+  private int getScreenRotation() {
+    return mCameraPreview
+        .getContext()
+        .getSystemService(WindowManager.class)
+        .getDefaultDisplay()
+        .getRotation();
+  }
+
   public boolean isCameraAvailable() {
     return mCamera != null && !mTakingPicture && mIsHardwareAccelerationSupported;
   }
@@ -672,7 +694,14 @@
 
     @Override
     public void onOrientationChanged(final int orientation) {
-      updateCameraOrientation();
+      if (!mTakingPicture) {
+        mRotation =
+            updateCameraRotation(
+                mCamera,
+                getScreenRotation(),
+                mCameraInfo.orientation,
+                mCameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT);
+      }
     }
   }
 
diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java b/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
index b5542ab..7cb6921 100644
--- a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
+++ b/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
@@ -98,11 +98,11 @@
       // Couldn't get exif tags, not the end of the world
     }
 
+    ExifInterface.OrientationParams params = ExifInterface.getOrientationParams(orientation);
     Bitmap bitmap = BitmapFactory.decodeByteArray(mBytes, 0, mBytes.length);
     final int clippedWidth;
     final int clippedHeight;
-    boolean invert = ExifInterface.getOrientationParams(orientation).invertDimensions;
-    if (invert) {
+    if (params.invertDimensions) {
       Assert.checkState(mWidth == bitmap.getHeight());
       Assert.checkState(mHeight == bitmap.getWidth());
       clippedWidth = (int) (mHeight * mHeightPercent);
@@ -120,7 +120,7 @@
     mHeight = clippedHeight;
 
     Matrix matrix = new Matrix();
-    matrix.postRotate(invert ? 90 : 0);
+    matrix.postRotate(params.rotation);
 
     Bitmap clippedBitmap =
         Bitmap.createBitmap(
diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java b/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java
index 92dee1c..1bf9519 100644
--- a/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java
+++ b/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java
@@ -286,7 +286,7 @@
 
   /** Wrapper class to define some orientation parameters. */
   public static class OrientationParams {
-    int rotation = 0;
+    public int rotation = 0;
     int scaleX = 1;
     int scaleY = 1;
     public boolean invertDimensions = false;
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
index a4198fc..8169a3d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
@@ -24,7 +24,7 @@
   <FrameLayout
     android:id="@+id/mediapicker_enabled"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content">
 
     <!-- Default to using the hardware rendered camera preview, we will fall back to
     SoftwareCameraPreview in CameraMediaChooserView if needed -->
@@ -37,14 +37,14 @@
     <com.android.dialer.callcomposer.camera.camerafocus.RenderOverlay
       android:id="@+id/focus_visual"
       android:layout_width="match_parent"
-      android:layout_height="match_parent" />
+      android:layout_height="match_parent"/>
 
     <View
       android:id="@+id/camera_shutter_visual"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:background="@android:color/white"
-      android:visibility="gone" />
+      android:visibility="gone"/>
 
     <ImageView
       android:id="@+id/preview_image_view"
@@ -71,7 +71,8 @@
         android:layout_marginEnd="@dimen/camera_view_button_margin"
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/quantum_ic_fullscreen_white_48"
-        android:background="?android:selectableItemBackgroundBorderless"/>
+        android:background="?android:selectableItemBackgroundBorderless"
+        android:contentDescription="@string/description_camera_switch_full_screen"/>
 
       <ImageButton
         android:id="@+id/camera_exit_fullscreen"
@@ -82,7 +83,8 @@
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/quantum_ic_fullscreen_exit_white_48"
         android:visibility="gone"
-        android:background="?android:selectableItemBackgroundBorderless"/>
+        android:background="?android:selectableItemBackgroundBorderless"
+        android:contentDescription="@string/description_camera_switch_preview_screen"/>
 
       <ImageButton
         android:id="@+id/camera_capture_button"
@@ -93,7 +95,7 @@
         android:background="?android:selectableItemBackgroundBorderless"
         android:src="@drawable/ic_capture"
         android:scaleType="fitXY"
-        android:contentDescription="@string/camera_take_picture"/>
+        android:contentDescription="@string/description_camera_take_picture"/>
 
       <ImageButton
         android:id="@+id/swap_camera_button"
@@ -103,8 +105,7 @@
         android:layout_marginStart="@dimen/camera_view_button_margin"
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/front_back_switch_button_animation"
-        android:background="@drawable/transparent_button_background"
-        android:contentDescription="@string/camera_switch_camera_rear"/>
+        android:background="@drawable/transparent_button_background"/>
 
       <ImageButton
         android:id="@+id/camera_cancel_button"
@@ -116,7 +117,7 @@
         android:visibility="gone"
         android:background="@drawable/transparent_button_background"
         android:src="@drawable/quantum_ic_undo_white_48"
-        android:contentDescription="@string/camera_cancel_recording" />
+        android:contentDescription="@string/description_camera_cancel_photo" />
     </FrameLayout>
   </FrameLayout>
 
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
index 3892a20..f6326c1 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Skakel na volskerm-kamera oor"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Knoppie is nou voorste kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Knoppie is nou agterste kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop video-opname"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Gebruik tans voorste kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Gebruik tans agterste kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Neem foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skakel oor na volskerm-kamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skakel oor na kameravoorskou"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skakel oor na voorste kamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skakel oor na agterste kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Neem foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Neem foto weer"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
index e271798..87c70c7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ወደ ሙሉ ማያ ገጽ ካሜራ ቀይር"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"አዝራር አሁን የፊት ካሜራ ነው"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"አዝራር አሁን የኋላ ካሜራ ነው"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ቪዲዮ መቅዳትን አቁም"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"የፊት ካሜራ በመጠቀም ላይ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"የኋላ ካሜራ በመጠቀም ላይ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ፎቶ ያንሱ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ወደ ሙሉ ማያ ገጽ ካሜራ ይቀይሩ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ወደ ካሜራ ቅድመ ዕይታ ይቀይሩ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ወደ የፊት ካሜራ ይቀይሩ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ወደ የኋላ ካሜራ ይቀይሩ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ፎቶ ያንሱ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ፎቶ በድጋሚ ያንሱ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
index a045a11..fa27db7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"التبديل إلى الكاميرا بملء الشاشة"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"يشير الزر الآن إلى الكاميرا الأمامية"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"يشير الزر الآن إلى الكاميرا الخلفية"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"إيقاف تسجيل الفيديو"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"استخدام الكاميرا الأمامية"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"استخدام الكاميرا الخلفية"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"التقاط صورة"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"التبديل إلى الكاميرا بملء الشاشة"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"التبديل إلى معاينة الكاميرا"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"تبديل إلى الكاميرا الأمامية"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"تبديل مرة أخرى إلى الكاميرا الأمامية"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"التقاط صورة"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"إعادة التقاط الصورة"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
index 514463c..bfbf204 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Tam ekranlı kameraya keçin"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Düymə indi ön kameradır"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Düymə indi arxa kameradır"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video qeydi dayandırın"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Ön kamera istifadə olunur"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Arxa kamera istifadə olunur"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotoşəkil çəkin"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Tam ekranlı kameraya keçin"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kamera önizləməsinə keçin"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Ön kameraya keçin"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Arxa kameraya keçin"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto çəkin"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotonu yenidən çəkin"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
index aad8d9d..565b188 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Pređite na prikaz kamere preko celog ekrana"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Dugme sad aktivira prednju kameru"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Dugme sad aktivira zadnju kameru"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zaustavite snimanje videa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Koristimo prednju kameru"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Koristimo zadnju kameru"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Snimite sliku"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebacite na prikaz kamere preko celog ekrana"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebacite na pregled kamere"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebacite na prednju kameru"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebacite na zadnju kameru"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimite sliku"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovo snimite sliku"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
index 108ab7f..f15bbb9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Пераключыцца на поўнаэкранную камеру"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Кнопка зараз замацавана за пярэдняй камерай"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Кнопка зараз замацавана за задняй камерай"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Спыніць запіс відэа"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Выкарыстанне пярэдняй камеры"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Выкарыстанне задняй камеры"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Зрабіць фота"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Пераключыцца на поўнаэкранную камеру"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Пераключыцца ў рэжым перадпрагляду камеры"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Пераключыцца на пярэднюю камеру"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Пераключыцца на заднюю камеру"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зрабіць фота"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зрабіць фота яшчэ раз"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
index e965ed9..92352ff 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Превключване към камера на цял екран"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Бутонът сега е за предната камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Бутонът сега е за задната камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Спиране на видеозаписа"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Използва се предната камера"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Използва се задната камера"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Правене на снимка"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Превключване към камера на цял екран"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Превключване към визуализация на камерата"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Превключване към предната камера"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Превключване към задната камера."</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Снимане"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Повторно снимане"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
index 447b7e3..83774c7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"পূর্ণ স্ক্রীন ক্যামেরাতে পাল্টান"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"বোতামটিকে এখন সামনের ক্যামেরার জন্য ব্যবহার করা হবে"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"বোতামটিকে এখন পিছনের ক্যামেরার জন্য ব্যবহার করা হবে"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ভিডিও রেকর্ডিং বন্ধ করুন"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"সামনের ক্যামেরা ব্যবহার করা হচ্ছে"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"পিছনের ক্যামেরা ব্যবহার করা হচ্ছে"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ফটো তুলুন"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"সম্পূর্ণ স্ক্রীন জুড়ে ক্যামেরা খুলুন"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ক্যামেরার পূর্বরূপ মোডে পাল্টান"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"সামনের ক্যামেরাতে পাল্টান"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"পিছনের ক্যামেরাতে পাল্টান"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ফটো তুলুন"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"আবার ফটো তুলুন"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
index 8946f4f..c77a5de 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Prebaci na kameru preko cijelog ekrana"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Dugme je sada prednja kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Dugme je sada zadnja kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zaustavi snimanje videozapisa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Koristi se prednja kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Koristi se zadnja kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Snimi fotografiju"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebaci na kameru preko cijelog ekrana"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebaci na pregled kamere"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebaci na prednju kameru"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebaci na stražnju kameru"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimi fotografiju"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovo snimi fotografiju"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
index 6d8ffdc..39c069b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Canvia a la càmera en pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"El botó ara és la càmera frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"El botó ara és la càmera posterior"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Deixa d\'enregistrar el vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"S\'està utilitzant la càmera frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"S\'està utilitzant la càmera posterior"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fes una foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Canvia a la càmera en pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Canvia a la previsualització de la càmera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Canvia a la càmera frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Canvia a la càmera posterior"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fes una foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Torna a fer la foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
index 0e31108..222eb81 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Přepnout na fotoaparát na celou obrazovku"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Tlačítko nyní funguje pro přední fotoaparát"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Tlačítko nyní funguje pro zadní fotoaparát"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zastavit natáčení videa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Používá se přední fotoaparát"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Používá se zadní fotoaparát"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Vyfotit"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Přepnout na fotoaparát na celou obrazovku"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Přepnout na náhled fotoaparátu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Přepnout na přední fotoaparát"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Přepnout na zadní fotoaparát"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Vyfotit"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znovu vyfotit"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
index ca5a79e..0de7e08 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Skift til kamera i fuld skærm"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Knappen er nu frontkamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Knappen er nu bagsidekamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stands optagelse af video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Bruger frontkameraet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Bruger bagsidekameraet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tag billede"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skift til kamera i fuld skærm"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skift til forhåndsvisning af kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skift til kamera på forsiden"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skift til kamera på bagsiden"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tag billede"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tag billedet om"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
index 53d22eb..1b0d639 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Zur Vollbildkamera wechseln"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Schaltfläche ist jetzt Frontkamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Schaltfläche ist jetzt Rückkamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Videoaufzeichnung beenden"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Frontkamera wird verwendet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Rückkamera wird verwendet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Foto aufnehmen"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Zur Vollbildkamera wechseln"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Zur Kameravorschau wechseln"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Zur Frontkamera wechseln"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Zur Rückkamera wechseln"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto aufnehmen"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto neu aufnehmen"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
index 5763dec..d657f93 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Εναλλαγή σε κάμερα πλήρους οθόνης"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Το κουμπί είναι τώρα η μπροστινή κάμερα"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Το κουμπί είναι τώρα η πίσω κάμερα"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Διακοπή εγγραφής βίντεο"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Χρήση μπροστινής κάμερας"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Χρήση πίσω κάμερας"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Λήψη φωτογραφίας"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Εναλλαγή σε κάμερα πλήρους οθόνης"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Εναλλαγή σε προεπισκόπηση κάμερας"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Εναλλαγή σε κάμερα πρόσοψης"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Εναλλαγή σε πίσω κάμερα"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Λήψη φωτογραφίας"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Επανάληψη λήψης φωτογραφίας"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
index 5b8b4aa..9e76a69 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Switch to full-screen camera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Button is now front-facing camera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Button is now rear-facing camera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop recording video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Using front-facing camera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Using rear-facing camera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Take photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
index 5b8b4aa..9e76a69 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Switch to full-screen camera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Button is now front-facing camera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Button is now rear-facing camera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop recording video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Using front-facing camera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Using rear-facing camera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Take photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
index 5b8b4aa..9e76a69 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Switch to full-screen camera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Button is now front-facing camera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Button is now rear-facing camera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop recording video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Using front-facing camera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Using rear-facing camera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Take photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
index a98e74c..f103564 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Cambiar a cámara en pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"El botón cambió a la cámara frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"El botón cambió a la cámara trasera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Detener la grabación de video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Usando la cámara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Usando la cámara trasera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tomar una foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambiar a cámara en pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambiar a vista previa de la cámara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambiar a cámara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambiar a cámara trasera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tomar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Volver a tomar foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
index 5c4391e..5afb8c8 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Cambiar a cámara en pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"El botón se usa ahora para la cámara frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"El botón se usa ahora para la cámara trasera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Detener la grabación de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Estás utilizando la cámara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Estás utilizando la cámara trasera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Hacer una foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambiar a la cámara en pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambiar a la vista previa de la cámara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambiar a la cámara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambiar a la cámara trasera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Hacer una foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Repetir la foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
index d82dcd5..d4c37fe 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Täisekraaniga kaamerale lülitamine"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Nuppu kasutatakse nüüd esikaamera jaoks"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Nuppu kasutatakse nüüd tagakaamera jaoks"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video salvestamise peatamine"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Esikaamera kasutamine"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Tagakaamera kasutamine"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Foto jäädvustamine"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Täisekraaniga kaamerale lülitumine"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kaamera eelvaatele lülitumine"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Esikaamerale lülitumine"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Tagakaamerale lülitumine"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto jäädvustamine"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto uuesti jäädvustamine"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
index b3c20c9..4271983 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Erabili pantaila osoko kamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Orain, aurreko kamera erabiltzeko da botoia"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Orain, atzeko kamera erabiltzeko da botoia"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Utzi bideoa grabatzeari"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Aurreko kamera erabiltzen"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Atzeko kamera erabiltzen"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Atera argazkia"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Erabili pantaila osoko kamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Erabili kameraren aurrebista"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Erabili aurreko kamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Erabili atzeko kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Atera argazkia"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Atera berriro argazkia"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
index 24e757b..5d58771 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"جابه‌جایی به دوربین تمام صفحه"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"اکنون دکمه، دوربین جلو است"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"اکنون دکمه، دوربین عقب است"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"توقف ضبط ویدیو"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"استفاده از دوربین جلو"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"استفاده از دوربین عقب"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"عکس گرفتن"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"رفتن به دوربین تمام صفحه"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"رفتن به پیش‌نمایش دوربین"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"رفتن به دوربین جلو"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"رفتن به دوربین عقب"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"عکس گرفتن"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"عکس گرفتن مجدد"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
index 5a3ddd8..9d7cb09 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Siirry koko näytön kameraan"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Painikkeeseen on nyt määritetty etukamera."</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Painikkeeseen on nyt määritetty takakamera."</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Lopeta videon tallentaminen"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Etukamera käytössä"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Takakamera käytössä"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ota kuva"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Siirry koko näytön kameraan"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Siirry kameran esikatseluun"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Vaihda etukameraan"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Vaihda takakameraan"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ota kuva"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ota kuva uudelleen"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
index f0e644e..b202840 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Passer au mode plein écran de l\'appareil photo"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Le bouton est maintenant utilisé pour l\'appareil photo avant"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Le bouton est maintenant utilisé pour l\'appareil photo arrière"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Arrêter l\'enregistrement vidéo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Utilisation de la caméra avant"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Utilisation de la caméra arrière"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Prendre une photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passer au mode Plein écran de l\'appareil photo"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passer au mode Aperçu de l\'appareil photo"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Passer à l\'appareil photo avant"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Passer à l\'appareil photo arrière"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Prendre une photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Reprendre la photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
index 72de07f..a9cfe71 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Passer en caméra plein écran"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Le bouton affiche désormais la caméra frontale."</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Le bouton affiche désormais la caméra arrière."</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Arrêter l\'enregistrement vidéo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Caméra frontale activée"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Caméra arrière activée"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Prendre une photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passer en mode plein écran"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passer en mode aperçu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Utiliser la caméra avant"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Utiliser la caméra arrière"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Prendre une photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Reprendre la photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
index 2ab1ef0..3568a0f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Cambiar á cámara de pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Agora o botón é a cámara dianteira"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Agora o botón é a cámara traseira"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Deter gravación de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Estase utilizando a cámara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Estase utilizando a cámara traseira"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambia á cámara de pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambia á vista previa da cámara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambia á cámara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambia á cámara traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tira unha foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Repite a foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
index 60780d9..88037b5 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"બટન હવે આગળનો કૅમેરો છે"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"બટન હવે પાછળનો કૅમેરો છે"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"વિડિઓ રેકોર્ડિંગ બંધ કરો"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"આગળના કૅમેરાનો ઉપયોગ કરી રહ્યાં છે"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"પાછળના કૅમેરાનો ઉપયોગ કરી રહ્યાં છે"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ફોટો લો"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"કૅમેરા પૂર્વાવલોકન પર સ્વીચ કરો"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ફ્ર્ન્ટ ફેસિંગ કૅમેરા પર સ્વિચ કરો"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"પાછળના કૅમેરા પર સ્વિચ કરો"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ફોટો લો"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ફોટો ફરીથી લો"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
index cf89a7d..09a441f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"पूर्ण स्क्रीन कैमरा पर स्विच करें"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"बटन अब सामने का कैमरा है"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"बटन अब पीछे का कैमरा है"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"वीडियो रिकॉर्ड करना बंद करें"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"आगे वाले कैमरे का उपयोग करना"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"पीछे वाले कैमरे का उपयोग करना"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"फ़ोटो लें"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रीन कैमरे में बदलें"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"कैमरा पूर्वावलोकन में बदलें"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"सामने वाले कैमरे में बदलें"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"पीछे वाले कैमरे में बदलें"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"फ़ोटो लें"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"फि‍र से फ़ोटो लें"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
index 3d59fd4..2dca9bd 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Prebaci na fotoaparat na punom zaslonu"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Gumb je sada za prednji fotoaparat"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Gumb je sada za stražnji fotoaparat"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zaustavi snimanje videozapisa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Upotreba prednje kamere"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Upotreba stražnje kamere"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Snimi fotografiju"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebaci na prikaz fotoaparata preko cijelog zaslona"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebaci na pregled fotoaparata"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebaci na prednji fotoaparat"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebaci na stražnji fotoaparat"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimi fotografiju"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovno snimi fotografiju"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
index 1639ca7..5007b3f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Váltás teljes képernyős kameranézetre"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"A gomb beállítása jelenleg: elülső kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"A gomb beállítása jelenleg: hátsó kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Videofelvétel leállítása"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Első kamera használata"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Hátsó kamera használata"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotó készítése"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Váltás teljes képernyős kameranézetre"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Váltás kamera-előnézetre"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Váltás az első kamerára"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Váltás a hátsó kamerára"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotó készítése"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Új felvétel"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
index 1da5c68..2c1bd79 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Միացնել լիաէկրան ռեժիմը"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Կոճակն այժմ առջևի տեսախցիկը միացնելու կոճակն է"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Կոճակն այժմ հետևի տեսախցիկը միացնելու կոճակն է"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Դադարեցնել տեսագրումը"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Օգտագործվում է առջևի տեսախցիկը"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Օգտագործվում է հետևի տեսախցիկը"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Լուսանկարել"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Միացնել լիաէկրան ռեժիմը"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Միացնել նախադիտման ռեժիմը"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Միացնել առջևի տեսախցիկը"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Միացնել հետևի տեսախցիկը"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Լուսանկարել"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Նորից լուսանկարել"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
index 6073d8e..4c922cd 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Beralih ke kamera layar penuh"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Tombol kini berfungsi untuk kamera depan"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Tombol kini berfungsi untuk kamera belakang"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Berhenti merekam video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Menggunakan kamera depan"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Menggunakan kamera belakang"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ambil foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Beralih ke kamera layar penuh"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Beralih ke pratinjau kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Beralih ke kamera depan"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Beralih ke kamera belakang"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ambil foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ambil ulang foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
index d16b2e2..c796d22 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Skipta yfir í myndavél á öllum skjánum"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Hnappurinn er nú fremri myndavél"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Hnappurinn er nú aftari myndavél"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stöðva upptöku myndskeiðs"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Notar fremri myndavél"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Notar aftari myndavél"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Taka mynd"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skipta yfir í myndavél á öllum skjánum"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skipta yfir í forskoðun á myndavél"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skipta yfir í fremri myndavél"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skipta yfir í aftari myndavél"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Taka mynd"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Taka mynd aftur"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
index 63fac07..abf5d3f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Passa alla fotocamera a schermo intero"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Il pulsante viene ora utilizzato per la fotocamera frontale"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Il pulsante viene ora utilizzato per la fotocamera posteriore"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Interrompi registrazione video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"In uso la fotocamera frontale"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"In uso la fotocamera posteriore"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Scatta foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passa alla fotocamera a schermo intero"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passa all\'anteprima della fotocamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Passa alla fotocamera anteriore"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Passa alla fotocamera posteriore"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Scatta foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Scatta foto di nuovo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
index 3db2e94..e6aed2e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"מעבר למצלמה במסך מלא"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"הלחצן מוגדר עכשיו למצלמה הקדמית"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"הלחצן מוגדר עכשיו למצלמה האחורית"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"עצירה של צילום הווידאו"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"באמצעות המצלמה הקדמית"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"באמצעות המצלמה האחורית"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"צילום תמונה"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"מעבר למצלמה במסך מלא"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"מעבר לתצוגה מקדימה של המצלמה"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"מעבר למצלמה הקדמית"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"מעבר למצלמה האחורית"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"צילום תמונה"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"צילום מחדש של התמונה"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
index ffb3a17..85ef3c8 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"全画面カメラに切り替え"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"現在、ボタンは前面カメラになっています"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"現在、ボタンは背面カメラになっています"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"録画を停止"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"前面カメラを使用しています"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"背面カメラを使用しています"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"写真を撮る"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"全画面カメラに切り替えます"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"カメラのプレビューに切り替えます"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"前面カメラに切り替えます"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"背面カメラに切り替えます"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"写真を撮影します"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"写真を撮り直します"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
index 6a94b65..edaf33f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"სრულეკრანიან კამერაზე გადართვა"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ახლა ღილაკი გამოიყენება წინა კამერისთვის"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ახლა ღილაკი გამოიყენება უკანა კამერისთვის"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ვიდეოს ჩაწერის შეჩერება"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"თქვენ იყენებთ წინა კამერას"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"თქვენ იყენებთ უკანა კამერას"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ფოტოს გადაღება"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"სრულეკრანიან კამერაზე გადართვა"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"კამერის წინასწარ ხედზე გადართვა"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"წინა კამერაზე გადართვა"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"უკანა კამერაზე გადართვა"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ფოტოს გადაღება"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ფოტოს ხელახლა გადაღება"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
index 22b89fd..795a063 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Толық экранды камераға ауысу"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Түйме – енді алдыңғы камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Түйме – енді артқы камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Бейне жазуды тоқтату"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Алдыңғы камера қолданылуда"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Артқы камера қолданылуда"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Суретке түсіру"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Толық экранды камераға ауысу"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камераның алдын ала көру режиміне ауысу"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Камераның анфас режиміне ауысу"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Камераның қалыпты режиміне ауысу"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Суретке түсіру"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Суретке қайта түсіру"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
index dd547dd..377f885 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ឥឡូវ ប៊ូតុង​ស្ថិត​នៅ​​កាមេរ៉ា​មុខ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ឥឡូវ ប៊ូតុងស្ថិត​នៅ​កាមេរ៉ា​ក្រោយ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"បញ្ឈប់​ការ​ថត​វីដេអូ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"កំពុង​ប្រើ​ប្រាស់​កាមេរ៉ា​មុខ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"កំពុង​ប្រើប្រាស់​​​កាមេរ៉ា​ក្រោយ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ថតរូប"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ប្ដូរ​ទៅ​ការមើល​កាមេរ៉ា​សាកល្បង"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ប្ដូរ​ទៅ​កាមេរ៉ា​ខាង​មុខ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ប្តូរទៅកាមេរ៉ាខាងក្រោយ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ថតរូប"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ថតរូប​ឡើងវិញ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
index 471cfc9..1f5d1ea 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ಬಟನ್ ಈಗ ಮುಂಬದಿ ಕ್ಯಾಮರಾದಲ್ಲಿ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ಬಟನ್ ಈಗ ಹಿಂಬದಿ ಕ್ಯಾಮರಾದಲ್ಲಿ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ವೀಡಿಯೊ ರೆಕಾರ್ಡಿಂಗ್ ನಿಲ್ಲಿಸಿ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ಮುಂಬದಿ ಕ್ಯಾಮರಾ ಬಳಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"ಹಿಂಬದಿ ಕ್ಯಾಮರಾ ಬಳಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ಫೋಟೋ ತೆಗೆಯಿರಿ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ಕ್ಯಾಮರಾ ಪೂರ್ವವೀಕ್ಷಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ಮುಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ಹಿಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ಫೋಟೋ ತೆಗೆಯಿರಿ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ಫೋಟೋವನ್ನು ಮರುಸೆರೆಹಿಡಿಯಿರಿ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
index bb5e64d..1b675e7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"전체화면 카메라로 전환"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"현재 버튼: 전면 카메라"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"현재 버튼: 후면 카메라"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"동영상 녹화 중지"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"전면 카메라 사용 중"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"후면 카메라 사용 중"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"사진 촬영"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"전체화면 카메라로 전환"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"카메라 미리보기로 전환"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"전면 카메라로 전환"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"후면 카메라로 전환"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"사진 찍기"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"사진 다시 찍기"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
index fca2893..771f576 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Камераны толук экранга которуу"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Азыр баскычта \"Маңдайкы камера\" деп жазылып турат"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Азыр баскычта \"Арткы камера\" деп жазылып турат"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Видео жаздырууну токтотуу"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Маңдайкы камера колдонулууда"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Арткы камера колдонулууда"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Сүрөткө тартуу"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Камераны толук экранга которуу"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камераны алдын ала көрүү режимине которуу"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Маңдайкы камерага которуу"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Арткы камерага которуу"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Сүрөткө тартуу"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Кайра сүрөткө тартуу"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
index 0257e75..6bfdf4e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ຕອນນີ້ເປັນປຸ່ມກ້ອງໜ້າແລ້ວ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ຕອນນີ້ເປັນປຸ່ມກ້ອງຫຼັງແລ້ວ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ຢຸດການບັນທຶກວິດີໂອ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ກຳລັງໃຊ້ກ້ອງໜ້າ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"ກຳລັງໃຊ້ກ້ອງຫຼັງ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ຖ່າຍຮູບ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ສະຫຼັບໄປໃຊ້ຕົວຢ່າງກ້ອງ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ສະຫຼັບໄປໃຊ້ກ້ອງໜ້າ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ສະຫຼັບໄປໃຊ້ກ້ອງຫຼັງ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ຖ່າຍຮູບ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ຖ່າຍຮູບໃໝ່"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
index 62c6de9..6ff3b0d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Perjungti į viso ekrano režimu veikiantį fotoaparatą"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Dabar tai yra priekinio fotoaparato mygtukas"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Dabar tai yra užpakalinio fotoaparato mygtukas"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Sustabdyti vaizdo įrašymą"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Naudojamas priekinis fotoaparatas"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Naudojamas užpakalinis fotoaparatas"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotografuoti"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Perjungti į viso ekrano režimu veikiantį fotoaparatą"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Perjungti į fotoaparato peržiūrą"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Perjungti į priekinį fotoaparatą"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Perjungti į užpakalinį fotoaparatą"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotografuoti"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotografuoti iš naujo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
index 4800f6b..d6d4782 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Pārslēgties uz pilnekrāna kameru"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Poga tagad tiek izmantota priekšējai kamerai"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Poga tagad tiek izmantota aizmugurējai kamerai"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Pārtraukt videoklipa ierakstīšanu"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Tiek izmantota priekšējā kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Tiek izmantota aizmugurējā kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Uzņemt fotoattēlu"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Pārslēgt uz pilnekrāna kameru"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Pārslēgt uz kameras priekšskatījumu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Pārslēgt uz priekšējo kameru"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Pārslēgt uz aizmugurējo kameru"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Uzņemt fotoattēlu"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Atkārtoti uzņemt fotoattēlu"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
index 82c466f..a0f84a0 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Префрлете на камера на цел екран"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Копчето е сега предна камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Копчето е сега задна камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Сопрете со снимање видео"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Се користи предната камера"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Се користи задната камера"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Фотографирај"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Префрлете на камера на цел екран"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Префрлете на преглед на камера"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Префрлете на предна камера"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Префрлете на задна камера"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Фотографирај"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Фотографирај пак"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
index 0423da2..77c0a4f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ബട്ടൺ അമർത്തിയാൻ മുൻ ക്യാമറ ലഭിക്കും"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ബട്ടൺ അമർത്തിയാൻ പിൻ ക്യാമറ ലഭിക്കും"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"വീഡിയോ റെക്കോർഡുചെയ്യൽ നിർത്തുക"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"മുൻവശത്തെ ക്യാമറ ഉപയോഗിക്കുന്നു"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"പിൻഭാഗത്തുള്ള ക്യാമറ ഉപയോഗിക്കുന്നു"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ഫോട്ടോ എടുക്കുക"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ക്യാമറ പ്രിവ്യൂവിലേക്ക് മാറുക"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"മുൻ ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"പിൻ ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ഫോട്ടോ എടുക്കുക"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ഫോട്ടോ വീണ്ടുമെടുക്കുക"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
index 024e004..1894634 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Бүтэн дэлгэцийн камер руу сэлгэх"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Товчлуур нь урд талын камер боллоо"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Товчлуур нь ард талын камер боллоо"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Видео бичилтийг зогсоох"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Урд камер ашиглаж байна"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Арын камер ашиглаж байна"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Зураг авах"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Бүтэн дэлгэцийн камер руу сэлгэх"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камерын урьдчилан үзэх рүү сэлгэх"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Урд талын камер руу сэлгэх"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Ар талын камер руу сэлгэх"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зураг авах"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зураг дахин авах"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
index bc9c2fb..24c1931 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"बटण आता पुढील कॅमेरा आहे"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"बटण आता मागील कॅमेरा आहे"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"व्हिडिओ रेकॉर्ड करणे थांबवा"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"समोरील कॅमेरा वापरत आहे"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"मागील कॅमेरा वापरत आहे"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"फोटो घ्‍या"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"कॅमेरा पूर्वावलोकनावर स्विच करा"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"समोरील कॅमऱ्यावर स्विच करा"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"मागील कॅमेर्‍यावर स्‍विच करा"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"फोटो घ्‍या"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"फोटो पुन्हा घ्या"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
index 3245b9c..44806f5 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Tukar kepada kamera skrin penuh"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Butang kini kamera depan"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Butang kini kamera belakang"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Berhenti merakam video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Menggunakan kamera depan"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Menggunakan kamera belakang"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ambil foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Beralih ke kamera skrin penuh"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Beralih ke pratonton kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Beralih ke kamera menghadap depan"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Beralih ke kamera menghadap belakang"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ambil foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ambil semula foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
index 884c0c8..7112abc 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ခလုတ်မှာ အရှေ့ကင်မရာအတွက် ဖြစ်သွားပါပြီ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ခလုတ်မှာ အနောက်ကင်မရာအတွက် ဖြစ်သွားပါပြီ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ဗီဒီယိုရိုက်ကူးခြင်း ရပ်ရန်"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"အရှေ့ကင်မရာကို သုံးနေသည်"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"အနောက်ကင်မရာကို သုံးနေသည်"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ဓာတ်ပုံရိုက်ရန်"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ကင်မရာအစမ်းကြည့်ရှုမှုသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"အရှေ့ကင်မရာသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"အနောက်ကင်မရာသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ဓာတ်ပုံရိုက်ရန်"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ဓာတ်ပုံပြန်ရိုက်ရန်"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
index bfa58ed..5e5fb60 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Bytt til fullskjermkamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Nå er knappen frontkameraet"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Nå er knappen det bakre kameraet"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Slutt å filme"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Bruker frontkameraet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Bruker det bakre kameraet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ta et bilde"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
index 1362b32..d8ea795 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"बटन अब अगाडिको क्यामेराका लागि हो"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"बटन अब पछाडिको क्यामेराका लागि हो"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"भिडियो रेकर्ड रोक्नुहोस्"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"अगाडिको क्यामेरा प्रयोग गरिँदै"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"पछाडिको क्यामेरा प्रयोग गरिँदै"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"तस्बिर खिच्नुहोस्"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"क्यामेराको पूर्वावलोकन मोडमा बदल्नुहोस्"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"अगाडिपट्टिको क्यामेरामा बदल्नुहोस्"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"पछाडिपट्टिको क्यामेरामा बदल्नुहोस्"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"तस्बिर खिच्नुहोस्"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"पुन: तस्बिर खिच्नुहोस्"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
index 94f2718..0369fed 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Overschakelen naar camera op volledig scherm"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"De knop wordt nu gebruikt voor de camera aan de voorzijde"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"De knop wordt nu gebruikt voor de camera aan de achterzijde"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video-opname stoppen"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"De camera aan de voorzijde wordt gebruikt"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"De camera aan de achterzijde wordt gebruikt"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Foto maken"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Overschakelen naar camera op volledig scherm"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Overschakelen naar cameravoorbeeld"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Overschakelen naar camera aan voorzijde"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Overschakelen naar camera aan achterzijde"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto maken"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto opnieuw maken"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
index bfa58ed..5e5fb60 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Bytt til fullskjermkamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Nå er knappen frontkameraet"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Nå er knappen det bakre kameraet"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Slutt å filme"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Bruker frontkameraet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Bruker det bakre kameraet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ta et bilde"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
index 4296c98..e1247e0 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰਾ \'ਤੇ ਜਾਓ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ਬਟਨ ਹੁਣ ਮੂਹਰਲਾ ਕੈਮਰਾ ਹੈ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ਬਟਨ ਹੁਣ ਪਿਛਲਾ ਕੈਮਰਾ ਹੈ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ਵੀਡੀਓ ਰਿਕਾਰਡ ਕਰਨਾ ਬੰਦ ਕਰੋ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ਮੂਹਰਲਾ ਕੈਮਰਾ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"ਪਿਛਲਾ ਕੈਮਰਾ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ਬਦਲੀ ਕਰਕੇ ਕੈਮਰਾ ਪੂਰਵ-ਝਲਕ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ਬਦਲੀ ਕਰਕੇ ਮੂਹਰਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ਬਦਲੀ ਕਰਕੇ ਪਿਛਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ਫ਼ੋਟੋ ਮੁੜ-ਖਿੱਚੋ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
index 0e03e2d..b85afa6 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Włącz aparat pełnoekranowy"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Przycisk włącza teraz przedni aparat"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Przycisk włącza teraz tylny aparat"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zatrzymaj nagrywanie filmu"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Używany jest przedni aparat"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Używany jest tylny aparat"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Zrób zdjęcie"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Przełącz na aparat pełnoekranowy"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Przełącz na podgląd aparatu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Przełącz na przedni aparat"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Przełącz na tylny aparat"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Zrób zdjęcie"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Zrób nowe zdjęcie"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
index 7c1fa07..59f457c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Alternar para câmera em tela cheia"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"O botão agora está na câmera frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"O botão agora está na câmera traseira"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Parar gravação de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Usando a câmera frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Usando a câmera traseira"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Alternar para câmera em tela cheia"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Alternar para visualização da câmera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Alternar para câmera frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Alternar para câmera traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar foto novamente"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
index 661b4d9..71f651d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Mudar para a câmara de ecrã completo"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"O botão é agora utilizado para a câmara frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"O botão é agora utilizado para a câmara posterior"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Parar a gravação de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"A utilizar a câmara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"A utilizar a câmara posterior"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Mudar para a câmara de ecrã completo"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Mudar para a pré-visualização da câmara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Mudar para a câmara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Mudar para a câmara traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar nova foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
index 7c1fa07..59f457c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Alternar para câmera em tela cheia"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"O botão agora está na câmera frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"O botão agora está na câmera traseira"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Parar gravação de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Usando a câmera frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Usando a câmera traseira"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Alternar para câmera em tela cheia"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Alternar para visualização da câmera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Alternar para câmera frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Alternar para câmera traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar foto novamente"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
index 98d0050..f491f28 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Comutați la camera pe ecran complet"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Acum butonul este pentru camera foto frontală."</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Acum butonul este pentru camera foto posterioară."</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Opriți înregistrarea video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Este folosită camera foto frontală"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Este folosită camera foto posterioară"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotografiați"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Comutați la camera pe ecran complet"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Comutați la previzualizarea camerei"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Comutați la camera frontală"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Comutați la camera posterioară"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotografiați"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Refaceți fotografia"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
index a4c7206..9de3cab 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Перейти в полноэкранный режим"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Сейчас на кнопке написано: Фронтальная камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Сейчас на кнопке написано: Основная камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Остановить запись видео"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Используется фронтальная камера"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Используется основная камера"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Сделать снимок"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Переключиться в полноэкранный режим"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Переключиться в режим предварительного просмотра"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Переключиться на фронтальную камеру"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Переключиться на основную камеру"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Сделать снимок"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Новый снимок"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
index 6cc5eef..1747d1a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"පූර්ණ තිර කැමරාව වෙත මාරුවීම"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"බොත්තම දැන් ඉදිරිපස කැමරාවයි"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"බොත්තම දැන් පිටුපස කැමරාවයි"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"වීඩියෝව පටිගත කිරීම නැවැත්වීම"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ඉදිරිපස කැමරාව භාවිත කරමින්"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"පසුපස කැමරාව භාවිත කරමින්"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ඡායාරූපය ගන්න"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"පූර්ණ තිර කැමරාව වෙත මාරුවීම"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"කැමරා පෙරදසුන වෙත මාරුවීම"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ඉදිරිපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"පසුපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ඡායාරූපය ගැනීම"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ඡායාරූපය නැවත ගැනීම"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
index 916158b..a053e2f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Prepnúť na fotoaparát na celej obrazovke"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Tlačidlo sa nachádza v polohe Predný fotoaparát"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Tlačidlo sa nachádza v polohe Zadný fotoaparát"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zastaviť zaznamenávanie videa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Používa sa predný fotoaparát"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Používa sa zadný fotoaparát"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Odfotiť"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prepnúť na fotoaparát na celej obrazovke"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prepnúť na ukážku z fotoaparátu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prepnúť na predný fotoaparát"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prepnúť na zadný fotoaparát"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Odfotiť"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znova odfotiť"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
index ef1fe20..b50aaae 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Preklopi v celozaslonski način fotoaparata"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Gumb zdaj upravlja sprednji fotoaparat"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Gumb zdaj upravlja hrbtni fotoaparat"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Ustavi snemanje videoposnetka"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Uporaba fotoaparata spredaj"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Uporaba fotoaparata zadaj"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Posnemi fotografijo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Preklopi v celozaslonski način fotoaparata"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Preklopi v predogled fotoaparata"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Preklopi na fotoaparat na sprednji strani"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Preklopi na fotoaparat na zadnji strani"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Posnemi fotografijo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znova posnemi fotografijo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
index ff8cb87..4be0317 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Kalo në kamerën me ekran të plotë"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Butoni tani është kamera e përparme"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Butoni tani është kamera e pasme"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Ndalo regjistrimin e videos"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Po përdor kamerën e përparme"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Po përdor kamerën e pasme"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Bëj një fotografi"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Kalo në kamerën me ekran të plotë"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kalo te pamja paraprake e kamerës"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Kalo te kamera e përparme"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Kalo te kamera e pasme"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Bëj një fotografi"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Bëje përsëri fotografinë"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
index 17150b4..4afcbe9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Пређите на приказ камере преко целог екрана"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Дугме сад активира предњу камеру"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Дугме сад активира задњу камеру"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Зауставите снимање видеа"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Користимо предњу камеру"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Користимо задњу камеру"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Снимите слику"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Пребаците на приказ камере преко целог екрана"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Пребаците на преглед камере"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Пребаците на предњу камеру"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Пребаците на задњу камеру"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Снимите слику"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Поново снимите слику"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
index 3091479..8bd00cc 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Byt till fullskärmskamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Knappen är nu framåtvänd kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Knappen är nu bakåtvänd kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Sluta spela in video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Använder främre kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Använder bakre kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ta en bild"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Växla till helskärmskamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Växla till förhandsgranskning i kameran"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Växla till den framåtvända kameran"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Växla till den bakåtvända kameran"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta en bild"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta en ny bild"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
index 8608b75..c951ac6 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Badilisha utumie kamera ya skrini nzima"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Kitufe hiki sasa ni kamera ya mbele"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Kitufe hiki sasa ni kamera ya nyuma"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Acha kurekodi video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Inatumia kamera ya mbele"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Inatumia kamera ya nyuma"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Piga picha"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Badili utumie kamera ya skrini nzima"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Badili utumie onyesha la kuchungulia la kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Badili utumie kamera ya mbele"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Badili utumie kamera ya nyuma"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Piga picha"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Piga picha tena"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
index 9c42144..374cfcf 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"முழுத் திரை கேமராவிற்கு மாறும்"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"இப்போது முன்புறக் கேமராவைக் குறிக்கும் பொத்தான்"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"இப்போது பின்புறக் கேமராவைக் குறிக்கும் பொத்தான்"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"வீடியோ ரெக்கார்டு செய்யப்படுவதை நிறுத்தும்"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"முன்பக்கக் கேமராவைப் பயன்படுத்துகிறீர்கள்"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"பின்பக்கக் கேமராவைப் பயன்படுத்துகிறீர்கள்"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"படமெடுக்கும்"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"முழுத் திரை கேமராவிற்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"கேமரா மாதிரிக்காட்சிக்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"முன்பக்க கேமராவிற்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"பின்பக்க கேமராவிற்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"படமெடுக்கும் பொத்தான்"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"மீண்டும் படமெடுக்கும் பொத்தான்"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
index 4587593..099fa67 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"బటన్ ఇప్పుడు ముందువైపు కెమెరాగా పని చేస్తోంది"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"బటన్ ఇప్పుడు వెనుకవైపు కెమెరాగా పని చేస్తోంది"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"వీడియో రికార్డింగ్‌ను ఆపివేస్తుంది"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ముందు కెమెరాను ఉపయోగిస్తున్నాము"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"వెనుక కెమెరాను ఉపయోగిస్తున్నాము"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ఫోటో తీస్తుంది"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"కెమెరా పరిదృశ్యానికి మారుస్తుంది"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ముందువైపు కెమెరాకు మారుస్తుంది"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"వెనుకవైపు కెమెరాకు మారుస్తుంది"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ఫోటో తీస్తుంది"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ఫోటోను మళ్లీ తీస్తుంది"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
index 9b1150f..62c69a3 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"สลับไปยังกล้องแบบเต็มหน้าจอ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ขณะนี้ปุ่มเป็นกล้องหน้า"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ขณะนี้ปุ่มเป็นกล้องหลัง"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"หยุดการบันทึกวิดีโอ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"กำลังใช้กล้องหน้า"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"กำลังใช้กล้องหลัง"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ถ่ายภาพ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"เปลี่ยนเป็นกล้องแบบเต็มหน้าจอ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"เปลี่ยนเป็นการแสดงตัวอย่างจากกล้อง"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"เปลี่ยนเป็นกล้องหน้า"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"เปลี่ยนเป็นกล้องหลัง"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ถ่ายภาพ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ถ่ายภาพอีกครั้ง"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
index 5fd98c1..2f6fb83 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Lumilipat sa camera na full screen"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Ang button ay para na sa camera sa harap"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Ang button ay para na sa camera sa likod"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Ihinihinto ang pagre-record ng video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Ginagamit ang camera sa harap"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Ginagamit ang camera sa likuran"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Kumuha ng larawan"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Lumipat sa camera na full screen"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Lumipat sa preview ng camera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Lumipat sa camera na nasa harap"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Lumipat sa camera na nasa likod"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Kumuha ng larawan"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Kunang muli"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
index 80b0b94..da54ac8 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Tam ekran kameraya geçer"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Düğme artık ön kamera için kullanılıyor"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Düğme artık arka kamera için kullanılıyor"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video kaydını durdurur"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Ön kamera kullanılıyor"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Arka kamera kullanılıyor"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotoğraf çeker"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Tam ekran kameraya geçer"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kamera önizlemesine geçer"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Ön kameraya geçer"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Arka kameraya geçer"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotoğraf çeker"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotoğrafı yeniden çeker"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
index c250615..cea540a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Показ зображення з камери на весь екран"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Зараз це кнопка камери на передній панелі"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Зараз це кнопка камери на задній панелі"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Зупинення запису відео"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Використання фронтальної камери"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Використання задньої камери"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Зйомка фото"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Показ зображення з камери на весь екран"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Попередній перегляд зображення з камери"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Перейти до фронтальної камери"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Перейти до задньої камери"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зробити фото"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зробити фото ще раз"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
index edd4178..585a55a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"پوری اسکرین کے کیمرہ پر سوئچ کریں"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"بٹن اب فرنٹ کیمرا ہے"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"بٹن اب بیک کیمرا ہے"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ویڈیو ریکارڈ کرنے کو روکیں"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"فرنٹ کیمرا استعمال ہو رہا ہے"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"بیک کیمرا استعمال ہو رہا ہے"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"تصویر لیں"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"پوری اسکرین کے کیمرہ پر سوئچ کریں"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"کیمرہ پیش منظر پر سوئچ کریں"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"فرنٹ والے کیمرے پر سوئچ کریں"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"عقب والے کیمرے پر سوئچ کریں"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"تصویر لیں"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"دوبارہ تصویر لیں"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
index 0377673..8441d88 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"To‘liq ekranli rejimga o‘tish"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Endi bu old kamera tugmasi"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Endi bu orqa kamera tugmasi"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Videoga olishni to‘xtatish"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Old kameradan foydalanilmoqda"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Orqa kameradan foydalanilmoqda"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Suratga olish"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"To‘liq ekranli rejimga o‘tish"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Oldindan ko‘rish rejimiga o‘tish"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Old kamerani yoqish"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Orqa kamerani yoqish"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Rasmga olish"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Yangi rasmga olish"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
index 81a0e62..0546664 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Chuyển sang máy ảnh toàn màn hình"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Hiện tại, nút ở chế độ máy ảnh mặt trước"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Hiện tại, nút ở chế độ máy ảnh mặt sau"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Dừng quay video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Đang sử dụng máy ảnh trước"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Đang sử dụng máy ảnh sau"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Chụp ảnh"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Chuyển sang máy ảnh toàn màn hình"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Chuyển sang chế độ xem trước máy ảnh"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Chuyển sang máy ảnh mặt trước"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Chuyển sang máy ảnh mặt sau"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Chụp ảnh"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Chụp lại ảnh"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
index 311569c..24e9c1a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"切换到全屏相机模式"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"点按按钮可切换到前置摄像头"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"点按按钮可切换到后置摄像头"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"停止录制视频"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"正在使用前置摄像头"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"正在使用后置摄像头"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"拍照"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切换到全屏相机模式"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切换到相机预览模式"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切换到前置摄像头"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切换到后置摄像头"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重拍照片"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
index 890a18f..0310b10 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"切換至全屏攝像"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"按鈕目前為前置鏡頭"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"按鈕目前為後置鏡頭"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"停止錄製影片"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"使用前置鏡頭"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"使用後置鏡頭"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"拍照"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切換至全螢幕相機"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切換至相機預覽"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切換至前置鏡頭"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切換至後置鏡頭"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重新拍照"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
index 30fa03b..d41ddda 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"切換至全螢幕相機"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"按鈕目前設定為前置鏡頭"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"按鈕目前設定為後置鏡頭"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"停止錄影"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"目前使用的是前置鏡頭"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"目前使用的是後置鏡頭"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"拍攝相片"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切換至全螢幕相機"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切換至相機預覽畫面"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切換至前置鏡頭"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切換至後置鏡頭"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重新拍照"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
index 33a9284..6e147b7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Shintshela kukhamera yesikrini esigcwele"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Inkinobho manje iyikhamera yangaphambili"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Inkinobho manje iyikhamera yangemuva"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Misa ukurekhoda ividiyo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Isebenzisa ikhamera yangaphambili"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Isebenzisa ikhamera yangemuva"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Thatha isithombe"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Shintshela kukhamera yesikrini esigcwele"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Shintshela ekuhloleni kuqala kwekhamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Shintshela kwikhamera yangaphambili"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Shintshela kwikhamera ebheke emuva"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Thatha isithombe"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Thatha kabusha isithombe"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml
index 09d4a58..e3d5c24 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml
@@ -16,7 +16,7 @@
   -->
 <resources>
   <dimen name="camera_view_button_margin">22dp</dimen>
-  <dimen name="camera_view_button_size">46dp</dimen>
+  <dimen name="camera_view_button_size">48dp</dimen>
   <dimen name="capture_button_size">84dp</dimen>
   <dimen name="capture_button_bottom_margin">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml
index 999fe8f..4db7968 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml
@@ -1,17 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 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>
   <!-- Content description of button to switch to full screen camera -->
-  <string name="camera_switch_full_screen">Switch to full screen camera</string>
+  <string name="description_camera_switch_full_screen">Switch to full screen camera</string>
+  <!-- Content description of button to resize camera from fullscreen to only a preview -->
+  <string name="description_camera_switch_preview_screen">Switch to camera preview</string>
   <!-- Content description of button when after swapped to front -->
-  <string name="camera_switch_camera_facing">Button is now front camera</string>
+  <string name="description_camera_switch_camera_facing">Switch to front facing camera</string>
   <!-- Content description of button when after swapped to back -->
-  <string name="camera_switch_camera_rear">Button is now back camera</string>
-  <!-- Content description of button to cancel recording video -->
-  <string name="camera_cancel_recording">Stop recording video</string>
-  <!-- Accessibility announcement for when we are using the front facing camera -->
-  <string name="using_front_camera">Using front camera</string>
-  <!-- Accessibility announcement for when we are using the back camera -->
-  <string name="using_back_camera">Using back camera</string>
+  <string name="description_camera_switch_camera_rear">Switch to back facing camera</string>
   <!-- Content description of button to take a photo -->
-  <string name="camera_take_picture">Take photo</string>
+  <string name="description_camera_take_picture">Take photo</string>
+  <!-- Content description of button to cancel a photo -->
+  <string name="description_camera_cancel_photo">Retake photo</string>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
index 14703a4..588cc1d 100644
--- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
@@ -70,10 +70,22 @@
         android:background="@drawable/call_composer_contact_border"/>
     </RelativeLayout>
 
-    <android.support.v4.view.ViewPager
-      android:id="@+id/call_composer_view_pager"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/call_composer_view_pager_height"/>
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+      <com.android.dialer.widget.LockableViewPager
+          android:id="@+id/call_composer_view_pager"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/call_composer_view_pager_height"/>
+
+      <ProgressBar
+          android:id="@+id/call_composer_loading"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:visibility="gone"/>
+    </FrameLayout>
   </LinearLayout>
 
   <FrameLayout
@@ -96,7 +108,8 @@
           android:layout_height="match_parent"
           android:scaleType="center"
           android:src="@drawable/quantum_ic_camera_alt_white_24"
-          android:background="?android:attr/selectableItemBackgroundBorderless"/>
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/description_call_composer_camera"/>
 
       <ImageView
           android:id="@+id/call_composer_photo"
@@ -104,7 +117,8 @@
           android:layout_height="match_parent"
           android:scaleType="center"
           android:src="@drawable/quantum_ic_photo_white_24"
-          android:background="?android:attr/selectableItemBackgroundBorderless"/>
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/description_call_composer_photo"/>
 
       <ImageView
           android:id="@+id/call_composer_message"
@@ -112,7 +126,8 @@
           android:layout_height="match_parent"
           android:scaleType="center"
           android:src="@drawable/quantum_ic_message_white_24"
-          android:background="?android:attr/selectableItemBackgroundBorderless"/>
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/description_call_composer_message"/>
     </LinearLayout>
 
     <FrameLayout
diff --git a/java/com/android/dialer/callcomposer/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/res/values-af/strings.xml
index 81f97fd..44277c8 100644
--- a/java/com/android/dialer/callcomposer/res/values-af/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-af/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Laat toe"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Verleen toegang tot kamera om \'n foto te neem"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Verleen toegang tot media om \'n prent te deel"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Neem \'n foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Kies \'n foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Stuur \'n boodskap"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/res/values-am/strings.xml
index c442490..d848a04 100644
--- a/java/com/android/dialer/callcomposer/res/values-am/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-am/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ፍቀድ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ፎቶ ያንሱ፣ ለካሜራ መዳረሻ ይስጡ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"አንድ ምስል ለማጋራት ለማህደረ መረጃ መዳረሻ ይስጡ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ፎቶ ያንሱ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ፎቶ ይምረጡ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"መልዕክት ይላኩ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
index ba43f0f..44ea0eb 100644
--- a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"سماح"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"لالتقاط صورة، يجب منح إذن بالدخول إلى الكاميرا"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"لمشاركة صورة، يجب منح إذن بالدخول إلى الوسائط"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"التقاط صورة"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"اختيار صورة"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"إرسال رسالة"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/res/values-az/strings.xml
index 2f913d9..47a8257 100644
--- a/java/com/android/dialer/callcomposer/res/values-az/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-az/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"İcazə verin"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Şəkil çəkmək üçün kameraya giriş icazəsi verin"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Şəkli paylaşmaq üçün Mediaya giriş icazəsi verin"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Şəkil çəkin"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto seçin"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj göndərin"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
index c357d50..ef3ff06 100644
--- a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Dozvoli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Odobrite pristup Kameri da biste snimili sliku"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Odobrite pristup Medijima da biste delili sliku"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Slikajte"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izaberite sliku"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošaljite poruku"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/res/values-be/strings.xml
index bb3244b..b667cdb 100644
--- a/java/com/android/dialer/callcomposer/res/values-be/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-be/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Дазволіць"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Каб зрабіць фота, адкрыйце доступ да Камеры"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Каб абагуліць відарыс, адкрыйце доступ да медыяфайлаў"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Зрабіць фота"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбраць фота"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Адправіць паведамленне"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
index 1bc05cd..6a458c4 100644
--- a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Разрешаване"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"За да направите снимка, разрешете достъп до Камера"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"За да споделите изображение, разрешете достъп до Медии"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Правене на снимка"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Избиране на снимка"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Изпращане на съобщение"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
index e991b3b..c23edb6 100644
--- a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"অনুমতি দিন"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"একটি ফটো নিতে, ক্যামেরাতে অ্যাক্সেস দিন"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"কোনো ছবি শেয়ার করতে, মিডিয়াতে অ্যাক্সেস দিন"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"একটি ছবি তুলুন"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"একটি ফটো বেছে নিন"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"একটি বার্তা পাঠান"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
index 7d0b8d2..2955aea 100644
--- a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Dozvoli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Da snimite fotografiju, dajte pristup Kameri"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Da podijelite sliku, dozvolite pristup Medijima"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Uslikaj"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izaberi fotografiju"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
index 1a57f87..5b457e2 100644
--- a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permet"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Per fer una foto, dona accés a la càmera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Per compartir una imatge, dona accés al contingut multimèdia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Fes una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Tria una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envia un missatge"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
index 93ae0c1..2f4a06b 100644
--- a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Povolit"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Chcete-li pořídit fotku, povolte přístup k fotoaparátu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pokud chcete sdílet fotku, povolte přístup k mediálním souborům"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Vyfotit"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrat fotku"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Poslat zprávu"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/res/values-da/strings.xml
index b1e3e6d..3f7fb03 100644
--- a/java/com/android/dialer/callcomposer/res/values-da/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-da/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Tillad"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Du skal give adgang til kameraet for at tage et billede"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Du skal give adgang til medier for at dele et billede"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tag et billede"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vælg et billede"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en sms"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/res/values-de/strings.xml
index 9b9c13a..a57359e 100644
--- a/java/com/android/dialer/callcomposer/res/values-de/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-de/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Zulassen"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Um ein Foto aufzunehmen, musst du den Zugriff auf die Kamera erlauben."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Um ein Bild zu teilen, musst du den Zugriff auf deine Medien erlauben."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Bild aufnehmen"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto auswählen"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Nachricht senden"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/res/values-el/strings.xml
index 45fce84..1700135 100644
--- a/java/com/android/dialer/callcomposer/res/values-el/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-el/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Να επιτρέπεται"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Για να τραβήξετε μια φωτογραφία, παραχωρήστε πρόσβαση στην κάμερα"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Για να μοιραστείτε μια εικόνα, παραχωρήστε πρόσβαση στα πολυμέσα"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Λήψη φωτογραφίας"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Επιλογή φωτογραφίας"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Αποστολή μηνύματος"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
index c34cbbd..3398551 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Allow"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
index c34cbbd..3398551 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Allow"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
index c34cbbd..3398551 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Allow"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
index 797d001..fc0927f 100644
--- a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tomar una foto, permite el acceso a la cámara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir una imagen, permite el acceso al contenido multimedia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tomar una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/res/values-es/strings.xml
index 8a4e7d6..c6f0dcd 100644
--- a/java/com/android/dialer/callcomposer/res/values-es/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-es/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para hacer una foto, permite el acceso a la cámara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir una imagen, permite el acceso al contenido multimedia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Hacer una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/res/values-et/strings.xml
index 17b77a2..ecb2dee 100644
--- a/java/com/android/dialer/callcomposer/res/values-et/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-et/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Luba"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Foto jäädvustamiseks lubage juurdepääs kaamerale"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pildi jagamiseks lubage juurdepääs meediale"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Pildistamine"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto valimine"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sõnumi saatmine"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
index be2aba7..b55dfd2 100644
--- a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Baimendu"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Argazkiak ateratzeko, eman kamera atzitzeko baimena"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Irudiak partekatzeko, eman multimedia-edukirako sarbidea"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Atera argazki bat"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Aukeratu argazki bat"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Bidali mezu bat"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
index 9d588b2..034ab26 100644
--- a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"مجاز است"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"برای عکس گرفتن، به دوربین اجازه دسترسی بدهید"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"برای اشتراک‌گذاری تصویر، به رسانه اجازه دسترسی بدهید"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"عکس گرفتن"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"انتخاب عکس"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ارسال پیام"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
index 98821bc..c19cd7b 100644
--- a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Salli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Jos haluat ottaa valokuvan, salli kameran käyttö."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Jos haluat jakaa kuvan, salli kuvien käyttö."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ota kuva"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Valitse kuva"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Lähetä viesti"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
index 29c001d..37b1f19 100644
--- a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Autoriser"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Pour prendre une photo, autorisez l\'accès à l\'appareil photo"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pour partager une image, autorisez l\'accès au contenu multimédia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
index ab56289..00078a4 100644
--- a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Autoriser"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Pour prendre une photo, accordez l\'accès à l\'appareil photo."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pour partager une image, accordez l\'accès aux fichiers multimédia."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
index 5c86768..44b1790 100644
--- a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para sacar unha foto, concede permiso de acceso á cámara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir unha imaxe, concede permiso de acceso aos ficheiros multimedia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tira unha foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolle unha foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envía unha mensaxe"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
index c948d2e..64ffc1f 100644
--- a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"મંજૂરી આપો"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ફોટો લેવા માટે, કૅમેરાની ઍક્સેસ આપો"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"છબી શેર કરવા, મીડિયાની ઍક્સેસ આપો"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"એક ચિત્ર લો"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ફોટો પસંદ કરો"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"એક સંદેશ મોકલો"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
index 6cfdb16..6b0bc04 100644
--- a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"अनुमति दें"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"फ़ोटो लेने के लिए, कैमरे की ऐक्सेस दें"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"चित्र साझा करने के लिए, मीडिया की ऐक्सेस दें"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"चित्र लें"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"एक फ़ोटो चुनें"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"संदेश भेजें"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
index 613f1f4..a51318a 100644
--- a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Omogući"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Da biste snimili fotografiju, dopustite pristup Fotoaparatu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Za dijeljenje slike dopustite pristup Medijima"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Snimi fotografiju"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Odaberi fotografiju"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
index 451fcb4..a5faaa2 100644
--- a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Engedélyezés"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Fotó készítéséhez adjon hozzáférést a fényképezőgéphez"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Kép megosztásához adjon hozzáférést a médiafájlokhoz"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Kép készítése"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotó kiválasztása"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Üzenet küldése"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
index 43793d6..ea92e6a 100644
--- a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Թույլատրել"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Լուսանկարելու համար տրամադրեք Խցիկն օգտագործելու հնարավորություն"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Որևէ պատկերով կիսվելու համար տրամադրեք մեդիանյութերն օգտագործելու հնարավորություն"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Լուսանկարել"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Ընտրել լուսանկար"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Ուղարկել հաղորդագրություն"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/res/values-in/strings.xml
index 4f90810..302395b 100644
--- a/java/com/android/dialer/callcomposer/res/values-in/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-in/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Izinkan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Untuk mengambil foto, berikan akses ke Kamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Untuk membagikan gambar, berikan akses ke Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Jepret"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Mengirim pesan"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/res/values-is/strings.xml
index 5ca3050..cf525e1 100644
--- a/java/com/android/dialer/callcomposer/res/values-is/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-is/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Leyfa"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Til að taka mynd skaltu veita myndavélinni aðgang"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Til að deila mynd skaltu veita margmiðlunarefni aðgang"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Taka mynd"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velja mynd"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Senda skilaboð"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/res/values-it/strings.xml
index 40c893f..4a10984 100644
--- a/java/com/android/dialer/callcomposer/res/values-it/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-it/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Consenti"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Per poter scattare una foto devi concedere l\'accesso alla fotocamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Per condividere un\'immagine, devi concedere l\'accesso ai contenuti multimediali"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Scatta una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Scegli una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Invia un messaggio"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
index e1557dc..7fed447 100644
--- a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"אפשר"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"כדי שתוכל לצלם תמונות עליך להעניק לאפליקציה גישה למצלמה"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"כדי שתוכל לשתף תמונות עליך להעניק לאפליקציה גישה למדיה"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"צילום תמונה"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"בחירת תמונה"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"שליחת הודעה"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
index bc8161d..d13f40e 100644
--- a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"許可"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"写真を撮るには、まずカメラへのアクセスを許可してください"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"画像を共有するには、まずメディアへのアクセスを許可してください"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"画像を撮影します"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"写真を選択します"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"メッセージを送信します"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
index 79f39ab..8c2823f 100644
--- a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ნების დართვა"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ფოტოს გადასაღებად მიეცით კამერაზე წვდომა"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"სურათის გასაზიარებლად მიეცით მედიაზე წვდომა"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"სურათის გადაღება"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ფოტოს არჩევა"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"შეტყობინების გაგზავნა"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
index ffe045f..2a0f641 100644
--- a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Рұқсат беру"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Суретке түсіру үшін камераға кіруге рұқсат беріңіз"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Суретті жіберу үшін медиафайлға кіруге рұқсат беріңіз"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Суретке түсіру"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Суретті таңдау"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Хабар жіберу"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/res/values-km/strings.xml
index 4444bce..0e63923 100644
--- a/java/com/android/dialer/callcomposer/res/values-km/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-km/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"អនុញ្ញាត"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ដើម្បីថតរូប សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​កាមេរ៉ា"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ដើម្បីចែករំលែករូបភាព សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​មេឌៀ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ថតរូប"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ជ្រើសរើស​រូបថត"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ផ្ញើសារ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
index f50bdcc..96f7d5b 100644
--- a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ಅನುಮತಿಸಿ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ಫೋಟೋ ತೆಗೆಯಲು, ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶ ನೀಡಿ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಮಾಧ್ಯಮಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ಚಿತ್ರ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ಒಂದು ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
index d710afa..1dd63be 100644
--- a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"허용"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"사진을 찍으려면 카메라에 액세스할 수 있도록 허용하세요."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"이미지를 공유하려면 미디어에 액세스할 수 있도록 허용하세요."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"사진 촬영"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"사진 선택"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"메시지 보내기"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
index c7c0533..4a1f504 100644
--- a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Уруксат берүү"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Сүрөткө тартуу үчүн, колдонмого камераны пайдаланууга уруксат бериңиз"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Сүрөттү бөлүшүү үчүн мультимедиага кирүүгө уруксат бериңиз"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Сүрөткө тартуу"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Сүрөттү тандоо"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Билдирүү жөнөтүү"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
index 9c49460..5d58509 100644
--- a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ອະນຸຍາດ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ເພື່ອຖ່າຍຮູບ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາກ້ອງຖ່າຍຮູບກ່ອນ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ເພື່ອແບ່ງປັນຮູບພາບໃດໜຶ່ງ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາມີເດຍກ່ອນ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ຖ່າຍຮູບ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ເລືອກຮູບພາບ..."</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ສົ່ງຂໍ້ຄວາມ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
index 0b011f7..75f1236 100644
--- a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Leisti"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Kad galėtumėte fotografuoti, leiskite pasiekti fotoaparatą"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Kad galėtumėte bendrinti vaizdą, leiskite pasiekti mediją"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografuoti"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pasirinkti nuotrauką"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Siųsti pranešimą"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
index 8593ca0..895e0f3 100644
--- a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Atļaut"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Lai uzņemtu fotoattēlu, piešķiriet piekļuvi kamerai."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Lai kopīgotu attēlu, piešķiriet piekļuvi multivides saturam."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Uzņemt attēlu"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izvēlēties fotoattēlu"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sūtīt ziņojumu"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
index 40d7c62..623972e 100644
--- a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Дозволете"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"За да фотографирате, дозволете пристап до „Камера“"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"За да споделите слика, дозволете пристап до Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Фотографирајте"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Изберете фотографија"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Испратете порака"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
index 0a0833d..ad2ce5d 100644
--- a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"അനുവദിക്കുക"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ഫോട്ടോ എടുക്കുന്നതിന്, ക്യാമറയ്ക്ക് ആക്സസ് നൽകുക"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ഫോട്ടോ പങ്കിടുന്നതിന്, മീഡിയയ്ക്ക് ആക്സസ് നൽകുക"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ഒരു ചിത്രമെടുക്കുക"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ഒരു ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ഒരു സന്ദേശം അയയ്‌ക്കുക"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
index 54a292d..8895da7 100644
--- a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Зөвшөөрөх"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Зураг авахын тулд камерт хандах зөвшөөрөл олгох шаардлагатай"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Зураг хуваалцахын тулд медиад хандах зөвшөөрөл олгох шаардлагатай"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Зураг авах"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Зураг сонгоно уу"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Зурвас илгээх"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
index 7f8c5d7..fcfdebe 100644
--- a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"अनुमती द्या"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"एक फोटो घेण्यासाठी, कॅमेर्‍यामध्ये प्रवेश द्या"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"एखादी प्रतिमा सामायिक करण्यासाठी मीडियामध्ये प्रवेश द्या"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"एक फोटो घ्या"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"फोटो निवडा"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"एक संदेश पाठवा"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
index 0927cde..7101489 100644
--- a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Benarkan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Untuk mengambil foto, berikan akses kepada Kamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Untuk berkongsi imej, berikan akses kepada Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ambil gambar"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Hantar mesej"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/res/values-my/strings.xml
index 6608e9a..02fc375 100644
--- a/java/com/android/dialer/callcomposer/res/values-my/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-my/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ခွင့်ပြုရန်"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ဓာတ်ပုံရိုက်ရန် ကင်မရာသို့ ဝင်သုံးခွင့်ပေးပါ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ပုံမျှဝေရန် မီဒီယာသို့ ဝင်သုံးခွင့်ပေးပါ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ဓာတ်ပုံတစ်ပုံ ရွေးရန်"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"မက်ဆေ့ဂျ်ပို့ရန်"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
index 693e7fd..d66a165 100644
--- a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Tillat"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Gi tilgang til kameraet for å ta bilder"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Gi Media tilgang for å dele bilder"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
index 37dd681..a73f6f8 100644
--- a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"अनुमति दिनुहोस्"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"तस्बिर खिच्न, क्यामेरामाथि पहुँच दिनुहोस्"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"छवि आदान-प्रदान गर्न, मिडियामाथि पहुँच दिनुहोस्"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"तस्बिर खिच्नुहोस्"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"तस्बिर छनौट गर्नुहोस्"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"सन्देश पठाउनुहोस्"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
index ebb00c4..2125f5c 100644
--- a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Toestaan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Verleen toegang tot Camera om een foto te maken"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Verleen toegang tot Media om een afbeelding te delen"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Een foto nemen"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Een foto kiezen"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Een bericht verzenden"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/res/values-no/strings.xml
index 693e7fd..d66a165 100644
--- a/java/com/android/dialer/callcomposer/res/values-no/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-no/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Tillat"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Gi tilgang til kameraet for å ta bilder"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Gi Media tilgang for å dele bilder"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
index bf6be36..8241984 100644
--- a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ਫ਼ੋਟੋ ਖਿੱਚਣ ਲਈ, ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਦਿਓ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ਚਿੱਤਰ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਦਿਓ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ਇੱਕ ਤਸਵੀਰ ਖਿੱਚੋ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ਇੱਕ ਫ਼ੋਟੋ ਚੁਣੋ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
index ba74628..473007d 100644
--- a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Zezwól"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Aby zrobić zdjęcie, zezwól na dostęp do aparatu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Aby udostępnić zdjęcie, zezwól na dostęp do multimediów"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Zrób zdjęcie"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Wybierz zdjęcie"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Wyślij wiadomość"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
index 9feee7d..7996e06 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, permita o acesso à câmera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartilhar uma imagem, permita o acesso à mídia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
index 8b12d65..e071969 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, conceda acesso à Câmara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para partilhar uma imagem, conceda acesso a Multimédia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Selecionar foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
index 9feee7d..7996e06 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, permita o acesso à câmera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartilhar uma imagem, permita o acesso à mídia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
index 744ef80..48f6ec0 100644
--- a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permiteți"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Pentru a fotografia, permiteți accesul la Camera foto"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pentru a trimite o imagine, permiteți accesul la Conținutul media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografiați"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Alegeți o fotografie"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Trimiteți un mesaj"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
index 1abbc49..f991b09 100644
--- a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Разрешить"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Чтобы сделать снимок, предоставьте доступ к камере"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Чтобы поделиться изображением, предоставьте доступ к мультимедиа"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Сделать фото"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбрать фото"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Отправить сообщение"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/res/values-si/strings.xml
index 48a4474..ac27473 100644
--- a/java/com/android/dialer/callcomposer/res/values-si/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-si/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ඉඩ දෙන්න"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ඡායාරූපයක් ගැනීමට, කැමරාවට ප්‍රවේශය දෙන්න"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"රූපයක් බෙදා ගැනීමට, මාධ්‍යයට ප්‍රවේශය දෙන්න"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"පින්තුරයක් ගැනීම"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ඡායාරූපයක් තේරීම"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"පණිවිඩයක් යැවීම"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
index 2fb13c1..6945d76 100644
--- a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Povoliť"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Ak chcete fotiť, povoľte prístup k fotoaparátu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Ak chcete zdieľať obrázok, povoľte prístup k médiám"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Odfotiť"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrať fotku"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Odoslať správu"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
index 34126ab..2384edd 100644
--- a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Dovoli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Če želite posneti fotografijo, omogočite dostop do fotoaparata"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Če želite deliti sliko z drugimi, omogočite dostop do predstavnosti"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Posnemi fotografijo"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izberi fotografijo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošlji sporočilo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
index 35dd197..924383e 100644
--- a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Lejo"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Për të shkrepur një fotografi, jep qasjen te Kamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Për të ndarë një imazh, jep qasjen te Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Bëj një fotografi"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Zgjidh një fotografi"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Dërgo një mesazh"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
index 4fa34ed..c4c337f 100644
--- a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Дозволи"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Одобрите приступ Камери да бисте снимили слику"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Одобрите приступ Медијима да бисте делили слику"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Сликајте"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Изаберите слику"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Пошаљите поруку"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
index de33531..e19a5b5 100644
--- a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Tillåt"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Bevilja åtkomst till Kamera om du vill ta ett foto"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Bevilja åtkomst till Media om du vill dela en bild"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta en bild"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Välj ett foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Skicka ett meddelande"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
index e99fd06..280c488 100644
--- a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Ruhusu"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Ruhusu programu ifikie Kamera ili uweze kupiga picha"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Ruhusu programu ifikie Midia ili uweze kushiriki picha"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Piga picha"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Chagua picha"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Tuma ujumbe"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
index 4078148..df2a412 100644
--- a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"அனுமதி"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"படமெடுக்க, கேமராவிற்கு அணுகல் வழங்கவும்"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"படத்தைப் பகிர, மீடியாவிற்கு அணுகல் வழங்கவும்"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"படமெடுக்கவும்"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"புகைப்படத்தைத் தேர்வு செய்யும்"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"செய்தியை அனுப்பும்"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/res/values-te/strings.xml
index 101429c..9b8834d 100644
--- a/java/com/android/dialer/callcomposer/res/values-te/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-te/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"అనుమతించు"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ఫోటోను తీయడానికి, కెమెరాకు ప్రాప్యతను అందించండి"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"చిత్రాన్ని భాగస్వామ్యం చేయడానికి, మీడియాకు ప్రాప్యతను అందించండి"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"చిత్రాన్ని తీస్తుంది"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ఫోటోను ఎంచుకోండి"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"సందేశాన్ని పంపుతుంది"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/res/values-th/strings.xml
index a004d33..d643d53 100644
--- a/java/com/android/dialer/callcomposer/res/values-th/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-th/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"อนุญาต"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"หากต้องการถ่ายภาพ โปรดให้สิทธิ์การเข้าถึงกล้อง"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"หากต้องการแชร์รูปภาพ โปรดให้สิทธิ์การเข้าถึงสื่อ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ถ่ายภาพ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"เลือกรูปภาพ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ส่งข้อความ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
index e902a2f..e325ef5 100644
--- a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Payagan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Upang kumuha ng larawan, magbigay ng access sa Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Upang magbahagi ng imahe, magbigay ng access sa Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Kumuha ng larawan"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pumili ng larawan"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Magpadala ng mensahe"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
index 0dfe8b2..66557fd 100644
--- a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"İzin ver"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Fotoğraf çekmek için Kamera\'ya erişim izni verin"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Resim paylaşmak için Medya\'ya erişim izni verin"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Resim çeker"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotoğraf seçilmesini sağlar"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj gönderir"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
index 20898c3..45f5de5 100644
--- a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Дозволити"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Щоб сфотографувати, надайте доступ до камери"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Щоб поділитися зображенням, надайте доступ до медіа-вмісту"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Зробити знімок"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Вибрати фотографію"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Надіслати повідомлення"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
index 92a2f8c..ff96b0a 100644
--- a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"اجازت دیں"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"تصویر لینے کیلئے کیمرا کو رسائی دیں"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"تصویر کا اشتراک کرنے کیلئے میڈیا تک رسائی دیں"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"تصویر لیں"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ایک تصویر چنیں"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"پیغام بھیجیں"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
index 8450162..28e2378 100644
--- a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Ruxsat berish"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Suratga olish uchun kameraga kirshga ruxsat bering"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Rasmni baham ko‘rish uchun media fayllarga kirishga ruxsat bering"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Rasmga olish"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Rasm tanlash"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Xabar yuborish"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
index 2d060bd..b4a4b9e 100644
--- a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Cho phép"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Để chụp ảnh, hãy cấp quyền truy cập vào Máy ảnh"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Để chia sẻ ảnh, hãy cấp quyền truy cập vào Phương tiện"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Chụp ảnh"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Chọn ảnh"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Gửi tin nhắn"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
index a6c2f90..6e2324d 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"允许"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"要拍摄照片，请授予相机使用权限"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"要分享图片，请授予媒体访问权限"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"选择一张照片"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"发送信息"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
index 8f66f4f..a05100e 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"允許"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"如要拍照，請授予「相機」存取權"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"如要分享圖片，請授予「媒體」存取權"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
index a3af5af..206a02b 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"允許"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"如要拍照，請授予相機存取權"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"如要分享圖片，請授予媒體存取權"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"拍攝相片"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
index 2cce688..61cfac0 100644
--- a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Vumela"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Ukuze uthathe isithombe, nika ukufinyelela kukhamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Ukuze wabelane ngesithombe, nika ukufinyelela kumidiya"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Thatha isithombe"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Khetha isithombe"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Thumela umlayezo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values/strings.xml b/java/com/android/dialer/callcomposer/res/values/strings.xml
index cc7762b..0faf469 100644
--- a/java/com/android/dialer/callcomposer/res/values/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values/strings.xml
@@ -41,4 +41,10 @@
   <string name="camera_permission_text">To take a photo, give access to Camera</string>
   <!-- Text presented to the user explaining that we need device storage permission to view photos -->
   <string name="gallery_permission_text">To share an image, give access to Media</string>
+  <!-- Content description of button to show ui for taking a photo -->
+  <string name="description_call_composer_camera">Take a picture</string>
+  <!-- Content description of button to show ui for selecting a photo from the user's gallery -->
+  <string name="description_call_composer_photo">Choose a photo</string>
+  <!-- Content description of button to show ui for sending a message -->
+  <string name="description_call_composer_message">Send a message</string>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java
index 4d5853f..70cb61a 100644
--- a/java/com/android/dialer/calldetails/CallDetailsActivity.java
+++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java
@@ -35,27 +35,35 @@
 import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.postcall.PostCall;
 import com.android.dialer.protos.ProtoParsers;
 import java.util.List;
 
 /** Displays the details of a specific call log entry. */
-public class CallDetailsActivity extends AppCompatActivity implements OnMenuItemClickListener {
+public class CallDetailsActivity extends AppCompatActivity
+    implements OnMenuItemClickListener, CallDetailsFooterViewHolder.ReportCallIdListener {
 
   private static final String EXTRA_CALL_DETAILS_ENTRIES = "call_details_entries";
   private static final String EXTRA_CONTACT = "contact";
+  private static final String EXTRA_CAN_REPORT_CALLER_ID = "can_report_caller_id";
   private static final String TASK_DELETE = "task_delete";
 
   private List<CallDetailsEntry> entries;
 
   public static Intent newInstance(
-      Context context, @NonNull CallDetailsEntries details, @NonNull DialerContact contact) {
+      Context context,
+      @NonNull CallDetailsEntries details,
+      @NonNull DialerContact contact,
+      boolean canReportCallerId) {
     Assert.isNotNull(details);
     Assert.isNotNull(contact);
 
     Intent intent = new Intent(context, CallDetailsActivity.class);
     ProtoParsers.put(intent, EXTRA_CONTACT, contact);
     ProtoParsers.put(intent, EXTRA_CALL_DETAILS_ENTRIES, details);
+    intent.putExtra(EXTRA_CAN_REPORT_CALLER_ID, canReportCallerId);
     return intent;
   }
 
@@ -63,16 +71,29 @@
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.call_details_activity);
-    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+    Toolbar toolbar = findViewById(R.id.toolbar);
     toolbar.inflateMenu(R.menu.call_details_menu);
     toolbar.setOnMenuItemClickListener(this);
     toolbar.setTitle(R.string.call_details);
+    toolbar.setNavigationOnClickListener(
+        v -> {
+          PerformanceReport.recordClick(UiAction.Type.CLOSE_CALL_DETAIL_WITH_CANCEL_BUTTON);
+          finish();
+        });
     onHandleIntent(getIntent());
   }
 
   @Override
   protected void onResume() {
     super.onResume();
+
+    // Some calls may not be recorded (eg. from quick contact),
+    // so we should restart recording after these calls. (Recorded call is stopped)
+    PostCall.restartPerformanceRecordingIfARecentCallExist(this);
+    if (!PerformanceReport.isRecording()) {
+      PerformanceReport.startRecording();
+    }
+
     PostCall.promptUserForMessageIfNecessary(this, findViewById(R.id.recycler_view));
   }
 
@@ -90,9 +111,10 @@
                 intent, EXTRA_CALL_DETAILS_ENTRIES, CallDetailsEntries.getDefaultInstance())
             .getEntriesList();
 
-    RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+    RecyclerView recyclerView = findViewById(R.id.recycler_view);
     recyclerView.setLayoutManager(new LinearLayoutManager(this));
-    recyclerView.setAdapter(new CallDetailsAdapter(this, contact, entries));
+    recyclerView.setAdapter(new CallDetailsAdapter(this, contact, entries, this));
+    PerformanceReport.logOnScrollStateChange(recyclerView);
   }
 
   @Override
@@ -106,6 +128,22 @@
     return false;
   }
 
+  @Override
+  public void onBackPressed() {
+    PerformanceReport.recordClick(UiAction.Type.PRESS_ANDROID_BACK_BUTTON);
+    super.onBackPressed();
+  }
+
+  @Override
+  public void reportCallId(String number) {
+    ReportDialogFragment.newInstance(number).show(getFragmentManager(), null);
+  }
+
+  @Override
+  public boolean canReportCallerId(String number) {
+    return getIntent().getExtras().getBoolean(EXTRA_CAN_REPORT_CALLER_ID, false);
+  }
+
   /** Delete specified calls from the call log. */
   private class DeleteCallsTask extends AsyncTask<Void, Void, Void> {
 
diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapter.java b/java/com/android/dialer/calldetails/CallDetailsAdapter.java
index d2fdbb4..48e9b69 100644
--- a/java/com/android/dialer/calldetails/CallDetailsAdapter.java
+++ b/java/com/android/dialer/calldetails/CallDetailsAdapter.java
@@ -37,14 +37,17 @@
 
   private final DialerContact contact;
   private final List<CallDetailsEntry> callDetailsEntries;
+  private final CallDetailsFooterViewHolder.ReportCallIdListener listener;
   private final CallTypeHelper callTypeHelper;
 
   CallDetailsAdapter(
       Context context,
       @NonNull DialerContact contact,
-      @NonNull List<CallDetailsEntry> callDetailsEntries) {
+      @NonNull List<CallDetailsEntry> callDetailsEntries,
+      CallDetailsFooterViewHolder.ReportCallIdListener listener) {
     this.contact = Assert.isNotNull(contact);
     this.callDetailsEntries = callDetailsEntries;
+    this.listener = listener;
     callTypeHelper = new CallTypeHelper(context.getResources());
   }
 
@@ -60,7 +63,7 @@
             inflater.inflate(R.layout.call_details_entry, parent, false));
       case FOOTER_VIEW_TYPE:
         return new CallDetailsFooterViewHolder(
-            inflater.inflate(R.layout.call_details_footer, parent, false));
+            inflater.inflate(R.layout.call_details_footer, parent, false), listener);
       default:
         throw Assert.createIllegalStateFailException(
             "No ViewHolder available for viewType: " + viewType);
diff --git a/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java
index 3f89436..9d3f4bc 100644
--- a/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java
@@ -26,33 +26,41 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.DialerUtils;
 
 /** ViewHolder container for {@link CallDetailsActivity} footer. */
-public class CallDetailsFooterViewHolder extends RecyclerView.ViewHolder
-    implements OnClickListener {
+final class CallDetailsFooterViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
 
+  private final ReportCallIdListener listener;
   private final View container;
   private final View copy;
   private final View edit;
+  private final View reportCallerId;
 
   private String number;
 
-  public CallDetailsFooterViewHolder(View view) {
+  CallDetailsFooterViewHolder(View view, ReportCallIdListener listener) {
     super(view);
+    this.listener = listener;
     container = view.findViewById(R.id.footer_container);
     copy = view.findViewById(R.id.call_detail_action_copy);
     edit = view.findViewById(R.id.call_detail_action_edit_before_call);
+    reportCallerId = view.findViewById(R.id.call_detail_action_report_caller_id);
 
     copy.setOnClickListener(this);
     edit.setOnClickListener(this);
+    reportCallerId.setOnClickListener(this);
   }
 
   public void setPhoneNumber(String number) {
     this.number = number;
     if (TextUtils.isEmpty(number)) {
       container.setVisibility(View.GONE);
+    } else if (listener.canReportCallerId(number)) {
+      reportCallerId.setVisibility(View.VISIBLE);
     }
   }
 
@@ -60,14 +68,32 @@
   public void onClick(View view) {
     Context context = view.getContext();
     if (view == copy) {
+      PerformanceReport.recordClick(UiAction.Type.COPY_NUMBER_IN_CALL_DETAIL);
+
       Logger.get(context).logImpression(DialerImpression.Type.CALL_DETAILS_COPY_NUMBER);
       ClipboardUtils.copyText(context, null, number, true);
     } else if (view == edit) {
+      PerformanceReport.recordClick(UiAction.Type.EDIT_NUMBER_BEFORE_CALL_IN_CALL_DETAIL);
+      // Dialpad will be filled with this number, but we don't want to record it as user action
+      PerformanceReport.setIgnoreActionOnce(UiAction.Type.TEXT_CHANGE_WITH_INPUT);
+
       Logger.get(context).logImpression(DialerImpression.Type.CALL_DETAILS_EDIT_BEFORE_CALL);
       Intent dialIntent = new Intent(Intent.ACTION_DIAL, CallUtil.getCallUri(number));
       DialerUtils.startActivityWithErrorToast(context, dialIntent);
+    } else if (view == reportCallerId) {
+      listener.reportCallId(number);
     } else {
       Assert.fail("View on click not implemented: " + view);
     }
   }
+
+  /** Listener for reporting caller id */
+  interface ReportCallIdListener {
+
+    /** Tell listener that the user requested to report caller id info as inaccurate. */
+    void reportCallId(String number);
+
+    /** returns true if the number can be reported as inaccurate. */
+    boolean canReportCallerId(String number);
+  }
 }
diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
index 1ddd2e7..3df3c3a 100644
--- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
@@ -41,6 +41,7 @@
   private final View callBackButton;
   private final TextView nameView;
   private final TextView numberView;
+  private final TextView networkView;
   private final QuickContactBadge contactPhoto;
   private final Context context;
 
@@ -52,6 +53,7 @@
     callBackButton = container.findViewById(R.id.call_back_button);
     nameView = container.findViewById(R.id.contact_name);
     numberView = container.findViewById(R.id.phone_number);
+    networkView = container.findViewById(R.id.network);
     contactPhoto = container.findViewById(R.id.quick_contact_photo);
 
     callBackButton.setOnClickListener(this);
@@ -72,8 +74,6 @@
             contact.getNameOrNumber(),
             contact.getContactType());
 
-    contactPhoto.setContentDescription(
-        context.getString(R.string.description_contact_photo_details, contact.getNameOrNumber()));
     nameView.setText(contact.getNameOrNumber());
     if (!TextUtils.isEmpty(contact.getDisplayNumber())) {
       numberView.setVisibility(View.VISIBLE);
@@ -90,6 +90,12 @@
       numberView.setText(null);
     }
 
+    if (!TextUtils.isEmpty(contact.getSimDetails().getNetwork())) {
+      networkView.setVisibility(View.VISIBLE);
+      networkView.setText(contact.getSimDetails().getNetwork());
+      networkView.setTextColor(context.getResources().getColor(contact.getSimDetails().getColor()));
+    }
+
     if (TextUtils.isEmpty(contact.getNumber())) {
       callBackButton.setVisibility(View.GONE);
     }
diff --git a/java/com/android/dialer/calldetails/ReportDialogFragment.java b/java/com/android/dialer/calldetails/ReportDialogFragment.java
new file mode 100644
index 0000000..c27bd61
--- /dev/null
+++ b/java/com/android/dialer/calldetails/ReportDialogFragment.java
@@ -0,0 +1,161 @@
+/*
+ * 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.
+ */
+
+package com.android.dialer.calldetails;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.phonenumbercache.CachedNumberLookupService;
+import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;
+import com.android.dialer.phonenumbercache.PhoneNumberCache;
+
+/** Dialog for reporting an inaccurate caller id information in {@link CallDetailsActivity}. */
+public class ReportDialogFragment extends DialogFragment {
+
+  private static final String KEY_NUMBER = "number";
+  private TextView name;
+  private TextView numberView;
+
+  private CachedNumberLookupService cachedNumberLookupService;
+  private CachedNumberLookupService.CachedContactInfo info;
+  private String number;
+
+  public static ReportDialogFragment newInstance(String number) {
+    ReportDialogFragment fragment = new ReportDialogFragment();
+    Bundle bundle = new Bundle();
+    bundle.putString(KEY_NUMBER, number);
+    fragment.setArguments(bundle);
+    return fragment;
+  }
+
+  @Override
+  public void onCreate(@Nullable Bundle bundle) {
+    super.onCreate(bundle);
+    setRetainInstance(true);
+    number = getArguments().getString(KEY_NUMBER);
+    cachedNumberLookupService = PhoneNumberCache.get(getContext()).getCachedNumberLookupService();
+  }
+
+  @Override
+  public Dialog onCreateDialog(Bundle savedInstanceState) {
+    LayoutInflater inflater = getActivity().getLayoutInflater();
+    View view = inflater.inflate(R.layout.caller_id_report_dialog, null, false);
+    name = view.findViewById(R.id.name);
+    numberView = view.findViewById(R.id.number);
+
+    lookupContactInfo(number);
+
+    AlertDialog reportDialog =
+        new AlertDialog.Builder(getActivity())
+            .setTitle(R.string.report_caller_id_dialog_title)
+            .setPositiveButton(android.R.string.ok, (dialog, which) -> positiveClick(dialog))
+            .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
+            .setView(view)
+            .create();
+
+    reportDialog.setOnShowListener(dialog -> onShow(getContext(), reportDialog));
+    return reportDialog;
+  }
+
+  private void positiveClick(DialogInterface dialog) {
+    startReportCallerIdWorker();
+    dialog.dismiss();
+  }
+
+  private static void onShow(Context context, AlertDialog dialog) {
+    int buttonTextColor = context.getColor(R.color.dialer_theme_color);
+    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(buttonTextColor);
+    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(buttonTextColor);
+  }
+
+  private void lookupContactInfo(String number) {
+    Worker<String, CachedContactInfo> worker =
+        number1 -> cachedNumberLookupService.lookupCachedContactFromNumber(getContext(), number1);
+    SuccessListener<CachedContactInfo> successListener = this::setCachedContactInfo;
+    DialerExecutorComponent.get(getContext())
+        .dialerExecutorFactory()
+        .createUiTaskBuilder(getFragmentManager(), "lookup_contact_info", worker)
+        .onSuccess(successListener)
+        .build()
+        .executeParallel(number);
+  }
+
+  private void setCachedContactInfo(CachedContactInfo info) {
+    this.info = info;
+    if (info != null) {
+      name.setText(info.getContactInfo().name);
+      numberView.setText(info.getContactInfo().number);
+    } else {
+      numberView.setText(number);
+      name.setVisibility(View.GONE);
+    }
+  }
+
+  private void startReportCallerIdWorker() {
+    Worker<Context, Pair<Context, Boolean>> worker = this::reportCallerId;
+    SuccessListener<Pair<Context, Boolean>> successListener = this::onReportCallerId;
+    DialerExecutorComponent.get(getContext())
+        .dialerExecutorFactory()
+        .createUiTaskBuilder(getFragmentManager(), "report_caller_id", worker)
+        .onSuccess(successListener)
+        .build()
+        .executeParallel(getActivity());
+  }
+
+  private Pair<Context, Boolean> reportCallerId(Context context) {
+    if (cachedNumberLookupService.reportAsInvalid(context, info)) {
+      info.getContactInfo().isBadData = true;
+      cachedNumberLookupService.addContact(context, info);
+      LogUtil.d("ReportUploadTask.doInBackground", "Contact reported.");
+      return new Pair<>(context, true);
+    } else {
+      return new Pair<>(context, false);
+    }
+  }
+
+  private void onReportCallerId(Pair<Context, Boolean> output) {
+    Context context = output.first;
+    boolean wasReport = output.second;
+    if (wasReport) {
+      Toast.makeText(context, R.string.report_caller_id_toast, Toast.LENGTH_SHORT).show();
+    } else {
+      Toast.makeText(context, R.string.report_caller_id_failed, Toast.LENGTH_SHORT).show();
+    }
+  }
+
+  @Override
+  public void onDestroyView() {
+    if (getDialog() != null && getRetainInstance()) {
+      // Prevent dialog from dismissing on rotate.
+      getDialog().setDismissMessage(null);
+    }
+    super.onDestroyView();
+  }
+}
diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml b/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml
index ccfa4e7..fbca3f8 100644
--- a/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml
+++ b/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml
@@ -41,4 +41,13 @@
       android:layout_height="wrap_content"
       android:drawableStart="@drawable/quantum_ic_edit_grey600_24"
       android:text="@string/call_details_edit_number"/>
+
+  <TextView
+      android:id="@+id/call_detail_action_report_caller_id"
+      style="@style/CallDetailsActionItemStyle"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:drawableStart="@drawable/quantum_ic_report_grey600_24"
+      android:text="@string/call_details_report_call_id"
+      android:visibility="gone"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml b/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml
new file mode 100644
index 0000000..09d3c2b
--- /dev/null
+++ b/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml
@@ -0,0 +1,35 @@
+<?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
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:id="@+id/name"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="24dp"
+      android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+  <TextView
+      android:id="@+id/number"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="24dp"
+      android:textAppearance="?android:attr/textAppearanceMedium"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/res/layout/contact_container.xml b/java/com/android/dialer/calldetails/res/layout/contact_container.xml
index d8d6e4e..0911291 100644
--- a/java/com/android/dialer/calldetails/res/layout/contact_container.xml
+++ b/java/com/android/dialer/calldetails/res/layout/contact_container.xml
@@ -29,7 +29,7 @@
       android:id="@+id/quick_contact_photo"
       android:layout_width="@dimen/call_details_contact_photo_size"
       android:layout_height="@dimen/call_details_contact_photo_size"
-      android:layout_marginTop="2dp"
+      android:layout_centerVertical="true"
       android:padding="@dimen/call_details_contact_photo_padding"
       android:focusable="true"
       android:contentDescription="@string/description_quick_contact_for"/>
@@ -47,8 +47,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/photo_text_margin"
-        android:ellipsize="end"
-        android:maxLines="1"
         style="@style/PrimaryText"/>
 
     <TextView
@@ -56,8 +54,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/photo_text_margin"
-        android:ellipsize="end"
-        android:maxLines="1"
+        style="@style/SecondaryText"/>
+
+    <TextView
+        android:id="@+id/network"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/photo_text_margin"
+        android:visibility="gone"
         style="@style/SecondaryText"/>
   </LinearLayout>
 
diff --git a/java/com/android/dialer/calldetails/res/values-af/strings.xml b/java/com/android/dialer/calldetails/res/values-af/strings.xml
index 74fbcd0..3d15e5b 100644
--- a/java/com/android/dialer/calldetails/res/values-af/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-af/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Vee uit"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopieer nommer"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Wysig nommer voordat jy bel"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Gee foutiewe nommer aan"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Het \'n foto gestuur"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Het \'n foto ontvang"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontakbesonderhede vir <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Gee verkeerde nommer aan"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kon nie nommer aangee nie"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nommer is aangegee"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-am/strings.xml b/java/com/android/dialer/calldetails/res/values-am/strings.xml
index 4deaceb..2103353 100644
--- a/java/com/android/dialer/calldetails/res/values-am/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-am/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ሰርዝ"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ቁጥር ቅዳ"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ከመደወል በፊት ቁጥር አርትዕ ያድርጉ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"ትክክለኛ ያልሆነ ቁጥርን ሪፓርት አድርግ"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"አንድ ፎቶ ተልኳል"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"አንድ ፎቶ ደርሷል"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"የ<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> የእውቂያ ዝርዝሮች"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"የተሳሳተ ቁጥርን ሪፖርት ያድርጉ"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ቁጥሩን ሪፖርት ማድረግ አልተቻለም"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"ቁጥሩ ሪፖርት ተደርጓል"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ar/strings.xml b/java/com/android/dialer/calldetails/res/values-ar/strings.xml
index 11a80e9..066b89c 100644
--- a/java/com/android/dialer/calldetails/res/values-ar/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ar/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"حذف"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"نسخ الرقم"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"تعديل الرقم قبل الاتصال"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"الإبلاغ عن رقم غير دقيق"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"تم إرسال صورة"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"تم تلقي صورة"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"تفاصيل الاتصال بالمستخدم <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"الإبلاغ عن رقم غير صحيح"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"تعذر الإبلاغ عن الرقم"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"تم الإبلاغ عن الرقم"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-az/strings.xml b/java/com/android/dialer/calldetails/res/values-az/strings.xml
index 6710966..e9aaf14 100644
--- a/java/com/android/dialer/calldetails/res/values-az/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-az/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Silin"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Nömrəni kopyalayın"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Zəng etmədən öncə nömrəyə düzəliş edin"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Qeyri-dəqiq nömrəni bildirin"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Foto göndərildi"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Foto alındı"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> üçün kontakt detalları"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Yanlış nömrəni bildirin"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nömrəni bildirmək mümkün olmadı"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nömrə bildirildi"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml
index a08c4ed..780e674 100644
--- a/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Izbriši"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiraj broj"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Izmenite broj pre poziva"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijavi netačan broj"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Slika je poslata"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Slika je primljena"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontakt informacije za <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijavite netačan broj"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Prijavljivanje broja nije uspelo"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Broj je prijavljen"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-be/strings.xml b/java/com/android/dialer/calldetails/res/values-be/strings.xml
index 3997fb2..6c6724c 100644
--- a/java/com/android/dialer/calldetails/res/values-be/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-be/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Выдаліць"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Скапіраваць нумар"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Рэдагаваць нумар перад выклікам"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Падаць заяву аб недакладным нумары"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Адпраўлена фота"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Атрымана фота"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Кантактныя даныя абанента <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Падаць заяву аб няправільным нумары"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не ўдалося падаць заяву аб нумары"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Аб нумары пададзена заява"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-bg/strings.xml b/java/com/android/dialer/calldetails/res/values-bg/strings.xml
index 2354517..547fdbb 100644
--- a/java/com/android/dialer/calldetails/res/values-bg/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-bg/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Изтриване"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Копиране на номера"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Редактиране на номера преди обаждане"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Подаване на сигнал за неточен номер"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Изпратена бе снимка"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Получена бе снимка"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Подробности за контакта за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Подаване на сигнал за неправилен номер"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Сигналът за номера не можа да бъде подаден"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"За номера бе подаден сигнал"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-bn/strings.xml b/java/com/android/dialer/calldetails/res/values-bn/strings.xml
index 0667152..65798f5 100644
--- a/java/com/android/dialer/calldetails/res/values-bn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-bn/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"মুছুন"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"নম্বর কপি করুন"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"কল করার আগে নম্বর সম্পাদন করুন"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"ভুল নম্বর প্রতিবেদন করুন"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"একটি ফটো পাঠিয়েছেন"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"একটি ফটো পেয়েছেন"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> পরিচিতির বিশদ বিবরণ"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ভুল নম্বর প্রতিবেদন করুন"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"নম্বরটির প্রতিবেদন করা যায়নি"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"নম্বরটির প্রতিবেদন করা হয়েছে"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-bs/strings.xml b/java/com/android/dialer/calldetails/res/values-bs/strings.xml
index 305a413..10ef7aa 100644
--- a/java/com/android/dialer/calldetails/res/values-bs/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-bs/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Izbriši"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiraj broj"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Uredi broj prije poziva"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijavite nevažeći broj"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Fotografija poslana"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Fotografija primljena"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalji o kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijava pogrešnog broja"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Prijava broja nije moguća"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Broj je prijavljen"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ca/strings.xml b/java/com/android/dialer/calldetails/res/values-ca/strings.xml
index 6d5092e..59bd297 100644
--- a/java/com/android/dialer/calldetails/res/values-ca/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ca/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Suprimeix"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copia el número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edita el número abans de trucar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informa d\'un número incorrecte"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"S\'ha enviat una foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"S\'ha rebut una foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"<xliff:g id="MESSAGE">%1$s</xliff:g>"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Dades de contacte de: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informa d\'un número incorrecte"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"No s\'ha pogut informar del número"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"S\'ha informat del número"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-cs/strings.xml b/java/com/android/dialer/calldetails/res/values-cs/strings.xml
index bec5bab..d4748fc 100644
--- a/java/com/android/dialer/calldetails/res/values-cs/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-cs/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Smazat"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopírovat číslo"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Před voláním upravit číslo"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Nahlásit nesprávné číslo"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Byla poslána fotka"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Byla přijata fotka"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Podrobnosti kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Nahlásit nesprávné číslo"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Číslo se nepodařilo nahlásit"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Číslo bylo nahlášeno"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-da/strings.xml b/java/com/android/dialer/calldetails/res/values-da/strings.xml
index cfc4ad1..5de4486 100644
--- a/java/com/android/dialer/calldetails/res/values-da/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-da/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Slet"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiér nummer"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Rediger nummer før opkald"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportér et forkert nummer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Der blev sendt et billede"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Der blev modtaget et billede"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktoplysninger for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportér forkert nummer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Det forkerte nummer kunne ikke rapporteres"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummeret blev rapporteret"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-de/strings.xml b/java/com/android/dialer/calldetails/res/values-de/strings.xml
index 6443924..3c30d8e 100644
--- a/java/com/android/dialer/calldetails/res/values-de/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-de/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Löschen"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Nummer kopieren"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Nummer vor Anruf bearbeiten"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Falsche Nummer melden"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Hat ein Foto gesendet"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Hat ein Foto empfangen"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktdetails für <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Falsche Nummer melden"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nummer konnte nicht gemeldet werden"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummer gemeldet"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-el/strings.xml b/java/com/android/dialer/calldetails/res/values-el/strings.xml
index 04c850e..e5097d1 100644
--- a/java/com/android/dialer/calldetails/res/values-el/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-el/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Διαγραφή"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Αντιγραφή αριθμού"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Επεξεργασία αριθμού πριν από την κλήση"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Αναφορά ανακριβούς αριθμού"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Έγινε αποστολή φωτογραφίας"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Έγινε λήψη φωτογραφίας"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Στοιχεία επικοινωνίας επαφής <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Αναφορά λανθασμένου αριθμού"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Δεν ήταν δυνατή η αναφορά του αριθμού"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Υποβλήθηκε αναφορά για τον αριθμό"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml b/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml
index 5f4f559..45deb49 100644
--- a/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Delete"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copy number"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edit number before call"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Report inaccurate number"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Sent a photo"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Received a photo"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Report incorrect number"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Couldn\'t report number"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Number reported"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml b/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml
index 5f4f559..45deb49 100644
--- a/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Delete"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copy number"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edit number before call"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Report inaccurate number"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Sent a photo"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Received a photo"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Report incorrect number"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Couldn\'t report number"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Number reported"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml b/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml
index 5f4f559..45deb49 100644
--- a/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Delete"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copy number"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edit number before call"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Report inaccurate number"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Sent a photo"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Received a photo"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Report incorrect number"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Couldn\'t report number"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Number reported"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml b/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml
index 8986534..778868e 100644
--- a/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Borrar"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de llamar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar número incorrecto"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Enviaste una foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Recibiste una foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Datos de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar número incorrecto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"No se pudo informar el número."</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número informado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-es/strings.xml b/java/com/android/dialer/calldetails/res/values-es/strings.xml
index ad581b4..5cecffa 100644
--- a/java/com/android/dialer/calldetails/res/values-es/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-es/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Eliminar"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de llamar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Notificar un número incorrecto"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Se ha enviado una foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Se ha recibido una foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Información de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Notificar un número incorrecto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"No se ha podido notificar el número"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número notificado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-et/strings.xml b/java/com/android/dialer/calldetails/res/values-et/strings.xml
index 9190b28..c8f52ae 100644
--- a/java/com/android/dialer/calldetails/res/values-et/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-et/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Kustuta"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopeeri number"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Muuda numbrit enne helistamist"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Valest numbrist teavitamine"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Saatis foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Sai foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontakti <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> üksikasjad"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Valest numbrist teavitamine"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numbrist ei õnnestunud teavitada"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numbrist teavitati"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-eu/strings.xml b/java/com/android/dialer/calldetails/res/values-eu/strings.xml
index a8c48cf..5184e64 100644
--- a/java/com/android/dialer/calldetails/res/values-eu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-eu/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Ezabatu"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiatu zenbakia"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editatu zenbakia deitu aurretik"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Jakinarazi zenbakiaren informazioa okerra dela"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Argazki bat bidali duzu"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Argazki bat jaso duzu"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> kontaktuaren xehetasunak"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Jakinarazi zenbakia okerra dela"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Ezin izan da bidali jakinarazpena"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Bidali da jakinarazpena"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fa/strings.xml b/java/com/android/dialer/calldetails/res/values-fa/strings.xml
index d02591b..b37b2b5 100644
--- a/java/com/android/dialer/calldetails/res/values-fa/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fa/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"حذف"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"کپی کردن شماره"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ویرایش شماره قبل از تماس"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"گزارش شماره نادرست"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"عکسی ارسال کرد"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"عکسی دریافت کرد"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"جزئیات تماس <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"گزارش شماره نادرست"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"شماره گزارش نشد"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"شماره گزارش شد"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fi/strings.xml b/java/com/android/dialer/calldetails/res/values-fi/strings.xml
index 3b409ed..ead2c6a 100644
--- a/java/com/android/dialer/calldetails/res/values-fi/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fi/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Poista"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopioi numero"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Muokkaa numeroa ennen puhelua"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Ilmoita epätarkasta numerosta"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Lähetetty kuva"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Vastaanotettu kuva"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Yhteystiedot: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Ilmoita väärästä numerosta"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numerosta ilmoittaminen epäonnistui."</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numeroa koskeva ilmoitus lähetettiin."</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml
index 7b88bdd..714fb7b 100644
--- a/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Supprimer"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copier le numéro"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Modifier le numéro avant de passer l\'appel"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Signaler un numéro inexact"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Photo envoyée"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Photo reçue"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"« <xliff:g id="MESSAGE">%1$s</xliff:g> »"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Coordonnées de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Signaler un numéro incorrect"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Impossible de signaler le numéro"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numéro signalé"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fr/strings.xml b/java/com/android/dialer/calldetails/res/values-fr/strings.xml
index 8319a2c..f612341 100644
--- a/java/com/android/dialer/calldetails/res/values-fr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fr/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Supprimer"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copier le numéro"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Modifier le numéro avant d\'appeler"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Signaler un numéro incorrect"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Envoi d\'une photo"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Réception d\'une photo"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Coordonnées associées à <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Signaler un numéro incorrect"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Impossible de signaler le numéro"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Signalement du numéro effectué"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-gl/strings.xml b/java/com/android/dialer/calldetails/res/values-gl/strings.xml
index f7aa166..7f79834 100644
--- a/java/com/android/dialer/calldetails/res/values-gl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-gl/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Eliminar"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de chamar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar dun número impreciso"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Enviouse unha foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Recibiuse unha foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalles de contacto de: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar dun número incorrecto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Non se puido marcar o número como inadecuado"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Marcouse o número como inadecuado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-gu/strings.xml b/java/com/android/dialer/calldetails/res/values-gu/strings.xml
index 03e402e..9299705 100644
--- a/java/com/android/dialer/calldetails/res/values-gu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-gu/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"કાઢી નાખો"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"નંબર કૉપિ કરો"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"કૉલ કરતાં પહેલાં નંબર સંપાદિત કરો"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"અચોક્કસ નંબરની જાણ કરો"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"એક ફોટો મોકલ્યો"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"એક ફોટો પ્રાપ્ત કર્યો"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> માટે સંપર્ક વિગતો"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ખોટા નંબરની જાણ કરો"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"નંબરની જાણ કરી શકાઈ નથી"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"નંબરની જાણ કરી"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hi/strings.xml b/java/com/android/dialer/calldetails/res/values-hi/strings.xml
index 3e46920..08099fe 100644
--- a/java/com/android/dialer/calldetails/res/values-hi/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hi/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"हटाएं"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"नंबर कॉपी करें"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"कॉल करने से पहले नंबर संपादित करें"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"गलत जानकारी देने वाले नंबर की रिपोर्ट करें"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"फ़ोटो भेजी गई"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"फ़ोटो मिली"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> का संपर्क विवरण"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"गलत नंबर की रिपोर्ट करें"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"नंबर की रिपोर्ट नहीं की जा सकी"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"नंबर की रिपोर्ट की गई"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hr/strings.xml b/java/com/android/dialer/calldetails/res/values-hr/strings.xml
index c1cc360..6537181 100644
--- a/java/com/android/dialer/calldetails/res/values-hr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hr/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Brisanje"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiranje broja"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Uređivanje broja prije poziva"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijava netočnog broja"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Šalje fotografiju"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Prima fotografiju"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Pojedinosti o kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijava netočnog broja"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Prijava broja nije moguća"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Broj je prijavljen"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hu/strings.xml b/java/com/android/dialer/calldetails/res/values-hu/strings.xml
index 298c10e..43afbe3 100644
--- a/java/com/android/dialer/calldetails/res/values-hu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hu/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Törlés"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Szám másolása"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Szám szerkesztése hívás előtt"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Pontatlan szám bejelentése"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Küldött egy fotót"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Kapott egy fotót"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> részletes adatai."</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Helytelen szám bejelentése"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nem sikerült bejelenteni a számot"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Szám bejelentve"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hy/strings.xml b/java/com/android/dialer/calldetails/res/values-hy/strings.xml
index ab44622..05022ca 100644
--- a/java/com/android/dialer/calldetails/res/values-hy/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hy/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Ջնջել"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Պատճենել համարը"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Փոփոխել համարը զանգելուց առաջ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Հաղորդել սխալ համարի մասին"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Ուղարկվել է լուսանկար"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Ստացվել է լուսանկար"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ի կոնտակտային տվյալները"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Հաղորդում սխալ համարի մասին"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Չհաջողվեց ուղարկել հաղորդումը"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Հաղորդումն ուղարկվեց"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-in/strings.xml b/java/com/android/dialer/calldetails/res/values-in/strings.xml
index 68ced55..eaeb273 100644
--- a/java/com/android/dialer/calldetails/res/values-in/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-in/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Hapus"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Salin nomor"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edit nomor sebelum menelepon"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Laporkan nomor yang tidak akurat"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Mengirim foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Menerima foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detail kontak <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Laporkan nomor yang salah"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Tidak dapat melaporkan nomor"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nomor dilaporkan"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-is/strings.xml b/java/com/android/dialer/calldetails/res/values-is/strings.xml
index 667ebd6..ac522d5 100644
--- a/java/com/android/dialer/calldetails/res/values-is/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-is/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Eyða"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Afrita númer"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Breyta númeri áður en hringt er"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Tilkynna rangt númer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Sendi mynd"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Tók á móti mynd"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Tengiliðaupplýsingar um <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Tilkynna rangt númer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Ekki tókst að tilkynna númerið"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Númer tilkynnt"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-it/strings.xml b/java/com/android/dialer/calldetails/res/values-it/strings.xml
index 4f159d5..40c2245 100644
--- a/java/com/android/dialer/calldetails/res/values-it/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-it/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Elimina"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copia numero"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Modifica numero prima di chiamare"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Segnala numero sbagliato"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Foto inviata"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Foto ricevuta"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Dettagli contatto <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Segnala numero errato"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Impossibile segnalare il numero"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numero segnalato"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-iw/strings.xml b/java/com/android/dialer/calldetails/res/values-iw/strings.xml
index 87c6fed..ffc4d47 100644
--- a/java/com/android/dialer/calldetails/res/values-iw/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-iw/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"מחק"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"העתק את המספר"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ערוך את המספר לפני השיחה"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"דיווח על מספר לא מדויק"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"נשלחה תמונה"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"התקבלה תמונה"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"פרטי ההתקשרות של <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"דיווח על מספר שגוי"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"לא ניתן היה לדווח על המספר"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"המספר דווח"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ja/strings.xml b/java/com/android/dialer/calldetails/res/values-ja/strings.xml
index d3a15d4..24fcf2c 100644
--- a/java/com/android/dialer/calldetails/res/values-ja/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ja/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"削除"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"電話番号をコピー"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"発信前に電話番号を編集"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"情報が間違っている番号を報告"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"写真を送信しました"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"写真を受信しました"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"「<xliff:g id="MESSAGE">%1$s</xliff:g>」"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>の連絡先の詳細"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"間違った番号の報告"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"番号を報告できませんでした"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"番号を報告しました"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ka/strings.xml b/java/com/android/dialer/calldetails/res/values-ka/strings.xml
index 66f1928..3d92f61 100644
--- a/java/com/android/dialer/calldetails/res/values-ka/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ka/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"წაშლა"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ნომრის კოპირება"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ნომრის რედაქტირება დარეკვამდე"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"არაზუსტი ნომრის შეტყობინება"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ფოტო გაიგზავნა"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"მიღებულია ფოტო"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ის საკონტაქტო დეტალები"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"არასწორი ნომრის შეტყობინება"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ნომრის შეტყობინება ვერ მოხერხდა"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"ნომერი შეტყობინებულია"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-kk/strings.xml b/java/com/android/dialer/calldetails/res/values-kk/strings.xml
index c3903e1..c29daeb 100644
--- a/java/com/android/dialer/calldetails/res/values-kk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-kk/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Жою"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Нөмірді көшіру"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Нөмірді қоңырау шалуға дейін өзгерту"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Қате нөмір туралы хабарлау"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Сурет жіберілді"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Сурет қабылданды"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> контакт деректері"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Қате нөмір туралы хабарлау"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Нөмір туралы хабар жіберілмеді"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Нөмір туралы хабар жіберілді"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-km/strings.xml b/java/com/android/dialer/calldetails/res/values-km/strings.xml
index 240e28a..d5ea830 100644
--- a/java/com/android/dialer/calldetails/res/values-km/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-km/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"លុប"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ថតចម្លងលេខទូរសព្ទ"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"កែ​លេខ​ មុន​ពេល​ហៅទូរសព្ទ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"រាយការណ៍លេខមិនត្រឹមត្រូវ"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"បានផ្ញើរូបថត"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"បាន​ទទួល​រូបថត"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"ព័ត៌មាន​ទំនាក់​ទំនង​លម្អិត​សម្រាប់ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"រាយការណ៍​លេខ​មិន​ត្រឹមត្រូវ"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"មិន​អាច​រាយការណ៍​លេខ​បាន​ទេ"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"បាន​រាយការណ៍​លេខ"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-kn/strings.xml b/java/com/android/dialer/calldetails/res/values-kn/strings.xml
index a833ffc..aeff715 100644
--- a/java/com/android/dialer/calldetails/res/values-kn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-kn/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ಅಳಿಸಿ"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ಸಂಖ್ಯೆಯನ್ನು ನಕಲಿಸಿ"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ಕರೆ ಮಾಡುವ ಮೊದಲು ಸಂಖ್ಯೆಯನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"ನಿಖರವಾಗಿಲ್ಲದ ಸಂಖ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ಫೋಟೋ ಕಳುಹಿಸಲಾಗಿದೆ"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ಫೋಟೋ ಸ್ವೀಕರಿಸಲಾಗಿದೆ"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕ ವಿವರಗಳು"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ತಪ್ಪಾದ ಸಂಖ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ಸಂಖ್ಯೆಯನ್ನು ವರದಿ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"ವರದಿ ಮಾಡಲಾದ ಸಂಖ್ಯೆ"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ko/strings.xml b/java/com/android/dialer/calldetails/res/values-ko/strings.xml
index 700c360..f45d712 100644
--- a/java/com/android/dialer/calldetails/res/values-ko/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ko/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"삭제"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"전화번호 복사"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"통화하기 전에 번호 수정"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"잘못된 번호 신고하기"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"사진 전송됨"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"사진 수신됨"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\'<xliff:g id="MESSAGE">%1$s</xliff:g>\'"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>의 연락처 세부정보"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"잘못된 번호 신고"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"번호를 신고할 수 없습니다."</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"번호가 신고되었습니다."</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ky/strings.xml b/java/com/android/dialer/calldetails/res/values-ky/strings.xml
index 08546c8..9735abc 100644
--- a/java/com/android/dialer/calldetails/res/values-ky/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ky/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Жок кылуу"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Номерди көчүрүү"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Чалуудан мурун номерди түзөтүү"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Номердеги ката жөнүндө кабар берүү"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Сүрөт жөнөтүлдү"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Сүрөт алынды"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> байланыш маалыматтары"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Туура эмес номер жөнүндө кабарлоо"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Туура эмес номер жөнүндө кабар жөнөтүлбөй койду"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Туура эмес номер жөнүндө кабар берүү"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-lo/strings.xml b/java/com/android/dialer/calldetails/res/values-lo/strings.xml
index 8f099e8..880510e 100644
--- a/java/com/android/dialer/calldetails/res/values-lo/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-lo/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"​ລຶບ"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ສຳເນົາເບີໂທ"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ແກ້ໄຂເບີກ່ອນໂທ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"ລາຍງານເບີໂທທີ່ບໍ່ຖືກຕ້ອງ"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ສົ່ງຮູບພາບ"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ໄດ້ຮັບຮູບພາບແລ້ວ"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"ລາຍລະອຽດ​ການຕິດຕໍ່​ສຳລັບ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"​ລາຍ​ງານ​ເບີ​ໂທບໍ່​ຖືກ​ຕ້ອງ"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ບໍ່ສາມາດລາຍງານເບີໂທໄດ້"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"ລາຍງານເບີໂທແລ້ວ"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-lt/strings.xml b/java/com/android/dialer/calldetails/res/values-lt/strings.xml
index 62d89f5..2f195de 100644
--- a/java/com/android/dialer/calldetails/res/values-lt/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-lt/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Ištrinti"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopijuoti numerį"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Redaguoti numerį prieš skambinant"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Pranešti apie netikslų numerį"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Išsiuntė nuotrauką"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Gavo nuotrauką"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Išsami kontaktinė informacija: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Pranešimas apie netinkamą numerį"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nepavyko pranešti apie numerį"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Apie numerį pranešta"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-lv/strings.xml b/java/com/android/dialer/calldetails/res/values-lv/strings.xml
index 3625649..e119b12 100644
--- a/java/com/android/dialer/calldetails/res/values-lv/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-lv/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Dzēst"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopēt numuru"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Rediģēt numuru pirms zvanīšanas"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Ziņot par neprecīzu numuru"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Nosūtīja fotoattēlu"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Saņēma fotoattēlu"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"“<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktpersonas informācija: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Ziņošana par nepareizu numuru"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nevarēja nosūtīt ziņojumu par numuru"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Ziņojums par numuru nosūtīts"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-mk/strings.xml b/java/com/android/dialer/calldetails/res/values-mk/strings.xml
index 6d1fd71..2458e08 100644
--- a/java/com/android/dialer/calldetails/res/values-mk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-mk/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Избриши"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Копирај го бројот"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Измени го бројот пред повикот"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Пријавете погрешен број"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Испрати фотографија"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Прими фотографија"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Детали за контакт за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Пријавете неточен број"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не можеше да пријави бројот"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Бројот е пријавен"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ml/strings.xml b/java/com/android/dialer/calldetails/res/values-ml/strings.xml
index fbafb88..8164a21 100644
--- a/java/com/android/dialer/calldetails/res/values-ml/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ml/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ഇല്ലാതാക്കുക"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"നമ്പർ പകർത്തുക"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"കോൾ ചെയ്യുന്നതിന് മുമ്പായി നമ്പർ എഡിറ്റുചെയ്യുക"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"കൃത്യമല്ലാത്ത നമ്പർ റിപ്പോർട്ടുചെയ്യുക"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ഒരു ഫോട്ടോ അയച്ചു"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ഒരു ഫോട്ടോ ലഭിച്ചു"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> എന്നതിന്റെ കോൺ‌ടാക്റ്റ് വിശദാംശങ്ങൾ"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"തെറ്റായ നമ്പർ റിപ്പോർട്ടുചെയ്യുക"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"നമ്പർ റിപ്പോർട്ടുചെയ്യാനായില്ല"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"നമ്പർ റിപ്പോർട്ടുചെയ്‌തു"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-mn/strings.xml b/java/com/android/dialer/calldetails/res/values-mn/strings.xml
index 10b5d96..242f6ab 100644
--- a/java/com/android/dialer/calldetails/res/values-mn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-mn/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Устгах"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Дугаар хуулах"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Залгахын өмнө дугаар засах"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Тодорхой бус дугаарыг мэдээлэх"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Зураг илгээсэн"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Зураг хүлээн авсан"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-н харилцагчийн мэдээлэл"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Буруу дугаарыг мэдээлэх"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Дугаарыг мэдээлж чадсангүй"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Дугаарыг мэдээлсэн"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-mr/strings.xml b/java/com/android/dialer/calldetails/res/values-mr/strings.xml
index 5644664..d869e13 100644
--- a/java/com/android/dialer/calldetails/res/values-mr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-mr/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"हटवा"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"नंबर कॉपी करा"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"कॉल करण्यापूर्वी नंबर संपादित करा"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"चुकीच्या नंबरचा अहवाल द्या"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"एक फोटो पाठविला"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"एक फोटो प्राप्त झाला"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> साठी संपर्क तपशील"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"चुकीच्या नंबरचा अहवाल द्या"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"नंबरचा अहवाल देऊ शकलो नाही"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"नंबरचा अहवाल दिला"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ms/strings.xml b/java/com/android/dialer/calldetails/res/values-ms/strings.xml
index 157198d..7c0bfdd 100644
--- a/java/com/android/dialer/calldetails/res/values-ms/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ms/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Padam"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Salin nombor"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edit nombor sebelum panggilan"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Laporkan nombor yang tidak tepat"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Menghantar foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Foto diterima"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Butiran hubungan untuk <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Laporkan nombor yang tidak betul"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Tidak dapat melaporkan nombor"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nombor dilaporkan"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-my/strings.xml b/java/com/android/dialer/calldetails/res/values-my/strings.xml
index bf3f90b..34a57d5 100644
--- a/java/com/android/dialer/calldetails/res/values-my/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-my/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ဖျက်ရန်"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"နံပါတ်ကိုကူးယူရန်"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"မခေါ်ဆိုမီ နံပါတ်ကိုပြင်ဆင်ရန်"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"မတိကျသော နံပါတ်ကို တိုင်ကြားရန်"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ဓာတ်ပုံ ပို့လိုက်သည်"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ဓာတ်ပုံ လက်ခံရရှိသည်"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ၏ အဆက်အသွယ် အသေးစိတ်"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"မမှန်ကန်သည့် နံပါတ်ကို တိုင်ကြားရန်"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"နံပါတ်ကို မတိုင်ကြားနိုင်ပါ"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"နံပါတ်ကို တိုင်ကြားပြီးပါပြီ"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-nb/strings.xml b/java/com/android/dialer/calldetails/res/values-nb/strings.xml
index 609c8af..53ffd3a 100644
--- a/java/com/android/dialer/calldetails/res/values-nb/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-nb/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Slett"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiér nummeret"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Rediger nummeret før du ringer"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportér feil nummer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Et bilde ble sendt"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Et bilde ble mottatt"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktinformasjon for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportér feil nummer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kunne ikke rapportere nummeret"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummeret er rapportert"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ne/strings.xml b/java/com/android/dialer/calldetails/res/values-ne/strings.xml
index 6b60967..f8e10ca 100644
--- a/java/com/android/dialer/calldetails/res/values-ne/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ne/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"मेट्नुहोस्"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"नम्बर प्रतिलिपि गर्नुहोस्"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"कल गर्नु अघि नम्बर सम्पादन गर्नुहोस्"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"गलत नम्बरको रिपोर्ट गर्नुहोस्"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"एउटा तस्बिर पठाइयो"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"एउटा तस्बिर प्राप्त भयो"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> का सम्पर्क विवरणहरू"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"गलत नम्बरको रिपोर्ट गर्नुहोस्"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"नम्बरको रिपोर्ट गर्न सकिएन"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"नम्बरको रिपोर्ट गरियो"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-nl/strings.xml b/java/com/android/dialer/calldetails/res/values-nl/strings.xml
index f5efb1a..b8cb7fe 100644
--- a/java/com/android/dialer/calldetails/res/values-nl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-nl/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Verwijderen"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Nummer kopiëren"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Nummer bewerken vóór bellen"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Onjuist nummer melden"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Foto verzonden"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Foto ontvangen"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\'<xliff:g id="MESSAGE">%1$s</xliff:g>\'"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Contactgegevens voor <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Incorrect nummer melden"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kan nummer niet melden"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummer gemeld"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-no/strings.xml b/java/com/android/dialer/calldetails/res/values-no/strings.xml
index 609c8af..53ffd3a 100644
--- a/java/com/android/dialer/calldetails/res/values-no/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-no/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Slett"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiér nummeret"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Rediger nummeret før du ringer"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportér feil nummer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Et bilde ble sendt"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Et bilde ble mottatt"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktinformasjon for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportér feil nummer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kunne ikke rapportere nummeret"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummeret er rapportert"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pa/strings.xml b/java/com/android/dialer/calldetails/res/values-pa/strings.xml
index 8a9ec1f..b488d53 100644
--- a/java/com/android/dialer/calldetails/res/values-pa/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pa/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ਮਿਟਾਓ"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ਨੰਬਰ ਕਾਪੀ ਕਰੋ"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ਕਾਲ ਤੋਂ ਪਹਿਲਾਂ ਨੰਬਰ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"ਗਲਤ ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕਰੋ"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ਇੱਕ ਫ਼ੋਟੋ ਭੇਜੀ ਗਈ"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ਇੱਕ ਫ਼ੋਟੋ ਪ੍ਰਾਪਤ ਹੋਈ"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ਲਈ ਸੰਪਰਕ ਵੇਰਵੇ"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ਗਲਤ ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕਰੋ"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pl/strings.xml b/java/com/android/dialer/calldetails/res/values-pl/strings.xml
index 1a342b0..790dade 100644
--- a/java/com/android/dialer/calldetails/res/values-pl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pl/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Usuń"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiuj numer"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edytuj numer, zanim zadzwonisz"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Zgłoś niedokładny numer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Wysłano zdjęcie"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Odebrano zdjęcie"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Informacje kontaktowe: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Zgłoś nieprawidłowy numer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nie udało się zgłosić numeru"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numer został zgłoszony"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml
index 7abc8be..7cd3282 100644
--- a/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Excluir"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de ligar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar número inválido"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Enviou uma foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Recebeu uma foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalhes de contato para <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar número incorreto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Não foi possível informar o número"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número informado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml
index 5e6dae8..5749ebb 100644
--- a/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Eliminar"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar o número antes de efetuar a chamada"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Denunciar número incorreto"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Enviou uma foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Recebeu uma foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalhes de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Denunciar número incorreto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Não foi possível denunciar o número."</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número denunciado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pt/strings.xml b/java/com/android/dialer/calldetails/res/values-pt/strings.xml
index 7abc8be..7cd3282 100644
--- a/java/com/android/dialer/calldetails/res/values-pt/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pt/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Excluir"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de ligar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar número inválido"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Enviou uma foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Recebeu uma foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalhes de contato para <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar número incorreto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Não foi possível informar o número"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número informado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ro/strings.xml b/java/com/android/dialer/calldetails/res/values-ro/strings.xml
index 3a6447b..00ab0a3 100644
--- a/java/com/android/dialer/calldetails/res/values-ro/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ro/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Ștergeți"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiați numărul"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Modificați numărul înainte de apelare"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Raportați numărul ca incorect"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"A fost trimisă o fotografie."</string>
     <string name="received_a_photo" msgid="3528953225576480505">"A fost primită o fotografie."</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalii de contact pentru <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Raportați un număr incorect"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numărul nu a putut fi raportat."</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numărul a fost raportat."</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ru/strings.xml b/java/com/android/dialer/calldetails/res/values-ru/strings.xml
index b071dc6..b31b832 100644
--- a/java/com/android/dialer/calldetails/res/values-ru/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ru/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Удалить"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Скопировать номер"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Изменить номер перед вызовом"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Сообщить об ошибке в номере"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Отправлена фотография"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Получена фотография"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Сведения о контакте <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Неверный номер"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не удалось отправить отчет о неверном номере"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Отчет о неверном номере отправлен"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-si/strings.xml b/java/com/android/dialer/calldetails/res/values-si/strings.xml
index 999183b..62968ab 100644
--- a/java/com/android/dialer/calldetails/res/values-si/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-si/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"මකන්න"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"අංකය පිටපත් කරන්න"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ඇමතුමට පෙර අංකය සංස්කරණය කරන්න"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"වැරදි අංකය වාර්තා කරන්න"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ඡායාරූපයක් යැවිණි"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ඡායාරූපයක් ලැබිණි"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> සඳහා සම්බන්ධතා විස්තර"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"වැරදි අංකය වාර්තා කරන්න"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"අංකය වාර්තා කිරීමට නොහැකි විය"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"අංකය වාර්තා කරන ලදී"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sk/strings.xml b/java/com/android/dialer/calldetails/res/values-sk/strings.xml
index 57b90cf..ee62cbd 100644
--- a/java/com/android/dialer/calldetails/res/values-sk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sk/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Odstrániť"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopírovať číslo"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Pred volaním upraviť číslo"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Nahlásiť nesprávne číslo"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Bola odoslaná fotka"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Bola prijatá fotka"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> – podrobnosti kontaktu"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Nahlásenie nesprávneho čísla"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Číslo sa nepodarilo nahlásiť"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Číslo bolo nahlásené"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sl/strings.xml b/java/com/android/dialer/calldetails/res/values-sl/strings.xml
index 83ffcbb..70b0e59 100644
--- a/java/com/android/dialer/calldetails/res/values-sl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sl/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Izbriši"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiraj številko"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Pred klicanjem uredi številko"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijavi netočno številko"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Poslana fotografija"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Prejeta fotografija"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"»<xliff:g id="MESSAGE">%1$s</xliff:g>«"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Podrobnosti stika za <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijava napačne številke"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Številke ni bilo mogoče prijaviti"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Številka je prijavljena"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sq/strings.xml b/java/com/android/dialer/calldetails/res/values-sq/strings.xml
index d05770f..a3de4f1 100644
--- a/java/com/android/dialer/calldetails/res/values-sq/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sq/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Fshi"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopjo numrin"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Redakto numrin para telefonatës"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Raporto numrin e pasaktë"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"U dërgua një fotografi"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"U mor një fotografi"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detajet e kontaktit për <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Raporto numrin e pasaktë"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numri nuk mund të raportohej"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numri u raportua"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sr/strings.xml b/java/com/android/dialer/calldetails/res/values-sr/strings.xml
index a1294df..54c1550 100644
--- a/java/com/android/dialer/calldetails/res/values-sr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sr/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Избриши"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Копирај број"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Измените број пре позива"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Пријави нетачан број"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Слика је послата"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Слика је примљена"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Контакт информације за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Пријавите нетачан број"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Пријављивање броја није успело"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Број је пријављен"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sv/strings.xml b/java/com/android/dialer/calldetails/res/values-sv/strings.xml
index 9b2e25e..a7e1c12 100644
--- a/java/com/android/dialer/calldetails/res/values-sv/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sv/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Radera"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiera nummer"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Redigera nummer före samtal"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportera felaktigt nummer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Skickade ett foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Tog emot ett foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"<xliff:g id="MESSAGE">%1$s</xliff:g>"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktuppgifter för <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportera felaktigt nummer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Det gick inte att rapportera nummer"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummer rapporterat"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sw/strings.xml b/java/com/android/dialer/calldetails/res/values-sw/strings.xml
index b767337..f19fb7b 100644
--- a/java/com/android/dialer/calldetails/res/values-sw/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sw/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Futa"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Nakili nambari"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Hariri nambari kabla ya kupiga"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Ripoti nambari isiyo sahihi"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Picha imetumwa"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Picha imepokelewa"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Maelezo ya <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Ripoti nambari isiyosahihi"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Imeshindwa kuripoti nambari"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nambari imeripotiwa"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ta/strings.xml b/java/com/android/dialer/calldetails/res/values-ta/strings.xml
index 51ff04f..7f625f8 100644
--- a/java/com/android/dialer/calldetails/res/values-ta/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ta/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"நீக்கு"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"எண்ணை நகலெடு"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"அழைப்பதற்கு முன் எண்ணைத் திருத்து"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"துல்லியமற்ற எண் எனப் புகாரளி"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"படம் அனுப்பப்பட்டது"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"படம் பெறப்பட்டது"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>க்கான தொடர்பு விவரங்கள்"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"தவறான எண் எனப் புகாரளி"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"எண்ணைப் புகாரளிக்க முடியவில்லை"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"எண் புகாரளிக்கப்பட்டது"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-te/strings.xml b/java/com/android/dialer/calldetails/res/values-te/strings.xml
index 1d44e55..d6fc792 100644
--- a/java/com/android/dialer/calldetails/res/values-te/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-te/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"తొలగించు"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"నంబర్‌ను కాపీ చేయి"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"కాల్ చేసే ముందు నంబర్‌ను సవరించు"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"అనిర్దిష్టంగా ఉండే నంబర్‌ను నివేదించు"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ఫోటో పంపబడింది"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ఫోటో స్వీకరించబడింది"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> యొక్క సంప్రదింపు వివరాలు"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"చెల్లని నంబర్‌ను నివేదించండి"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"నంబర్‌ను నివేదించడం సాధ్యపడలేదు"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"నంబర్ నివేదించబడింది"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-th/strings.xml b/java/com/android/dialer/calldetails/res/values-th/strings.xml
index 3fe88f9..7bbcd12 100644
--- a/java/com/android/dialer/calldetails/res/values-th/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-th/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ลบ"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"คัดลอกหมายเลข"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"แก้ไขหมายเลขก่อนโทร"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"รายงานหมายเลขที่ผิดพลาด"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ส่งรูปภาพแล้ว"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ได้รับรูปภาพแล้ว"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"รายละเอียดที่ติดต่อสำหรับ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"รายงานหมายเลขที่ไม่ถูกต้อง"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ไม่สามารถรายงานหมายเลข"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"รายงานหมายเลขแล้ว"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-tl/strings.xml b/java/com/android/dialer/calldetails/res/values-tl/strings.xml
index 91fb3be..969a33a 100644
--- a/java/com/android/dialer/calldetails/res/values-tl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-tl/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"I-delete"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopyahin ang numero"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"I-edit ang numero bago tumawag"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Iulat ang hindi wastong numero"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Nagpadala ng larawan"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Nakatanggap ng larawan"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Mga detalye sa pakikipag-ugnayan para kay/sa <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Iulat ang hindi tamang numero"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Hindi maiulat ang numero"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Inulat ang numero"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-tr/strings.xml b/java/com/android/dialer/calldetails/res/values-tr/strings.xml
index f84d0b3..9976312 100644
--- a/java/com/android/dialer/calldetails/res/values-tr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-tr/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Sil"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Numarayı kopyala"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Telefon etmeden önce numarayı düzenleyin"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Hatalı numarayı bildir"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Bir fotoğraf gönderildi"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Bir fotoğraf alındı"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> için kişi ayrıntıları"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Yanlış numarayı bildir"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numara bildirilemedi"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numara bildirildi"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-uk/strings.xml b/java/com/android/dialer/calldetails/res/values-uk/strings.xml
index bf6e0ac..d37a54e 100644
--- a/java/com/android/dialer/calldetails/res/values-uk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-uk/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Видалити"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Копіювати номер"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Редагувати номер перед дзвінком"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Повідомити про неправильний номер"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Надіслано фотографію"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Отримано фотографію"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Відомості про контакт <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Повідомити про неправильний номер"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не вдалося повідомити про неправильний номер"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Ви повідомили про неправильний номер"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ur/strings.xml b/java/com/android/dialer/calldetails/res/values-ur/strings.xml
index 5a22869..960bef4 100644
--- a/java/com/android/dialer/calldetails/res/values-ur/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ur/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"حذف کریں"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"نمبر کاپی کریں"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"کال کرنے سے پہلے نمبر میں ترمیم کریں"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"غلط نمبر کی رپورٹ کریں"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ایک تصویر بھیجی"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ایک تصویر موصول ہوئی"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> کیلئے رابطہ کی تفصیلات"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"غلط نمبر کی اطلاع دیں"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"نمبر کی اطلاع نہیں دی جا سکی"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"نمبر کی اطلاع دے دی گئی"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-uz/strings.xml b/java/com/android/dialer/calldetails/res/values-uz/strings.xml
index 890b7ae..4f38cab 100644
--- a/java/com/android/dialer/calldetails/res/values-uz/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-uz/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"O‘chirib tashlash"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Raqamni nusxalash"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Qo‘ng‘iroq qilishdan oldin raqamni tahrirlash"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Raqamdagi xatolik haqida xabar berish"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Rasm yuborildi"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Rasm qabul qilindi"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"“<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> kontakt ma’lumotlari"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Noto‘g‘ri raqam"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Raqamdagi xatolik haqida xabar yuborib bo‘lmadi"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Raqamdagi xatolik haqida xabar yuborildi"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-vi/strings.xml b/java/com/android/dialer/calldetails/res/values-vi/strings.xml
index b589632..6adae2b 100644
--- a/java/com/android/dialer/calldetails/res/values-vi/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-vi/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Xóa"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Sao chép số"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Chỉnh sửa số trước khi gọi"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Báo cáo số không chính xác"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Đã gửi một ảnh"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Đã nhận một ảnh"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Chi tiết liên hệ cho <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Báo cáo số không chính xác"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Không thể báo cáo số"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Đã báo cáo số"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml
index 7b8b972..1edb5e1 100644
--- a/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"删除"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"复制号码"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"拨打电话之前修改号码"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"报告错误的号码"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"发送了一张照片"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"收到了一张照片"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"“<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>的详细联系信息"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"报告错误号码"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"无法报告错误的号码"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"已报告错误的号码"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml
index 8771098..a82e070 100644
--- a/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"刪除"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"複製號碼"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"在撥打前編輯號碼"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"報告錯誤號碼"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"已傳送相片"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"已收到相片"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"「<xliff:g id="MESSAGE">%1$s</xliff:g>」"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"「<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>」的聯絡人詳細資料"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"報告不正確的號碼"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"無法報告號碼"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"已報告號碼"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml
index 73aba80..3b9dd56 100644
--- a/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"刪除"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"複製號碼"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"撥打電話前編輯號碼"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"回報號碼錯誤"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"傳送了 1 張相片"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"收到了 1 張相片"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"「<xliff:g id="MESSAGE">%1$s</xliff:g>」"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"「<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>」的聯絡詳細資料"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"回報不正確的號碼"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"無法回報號碼"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"已回報號碼"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zu/strings.xml b/java/com/android/dialer/calldetails/res/values-zu/strings.xml
index 94040ce..25e0cea 100644
--- a/java/com/android/dialer/calldetails/res/values-zu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zu/strings.xml
@@ -21,8 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Susa"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopisha inombolo"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Hlela inombolo ngaphambi kokushaya ucingo"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Bika inombolo engalungile"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Uthumele isithombe"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Uthole isithombe"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Imininingwane yokuxhumana ka-<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Bika inombolo engalungile"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Ayikwazanga ukubika inombolo"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Inombolo ibikiwe"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values/strings.xml b/java/com/android/dialer/calldetails/res/values/strings.xml
index 6b3b179..1441efd 100644
--- a/java/com/android/dialer/calldetails/res/values/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values/strings.xml
@@ -27,6 +27,9 @@
   <!-- Label for action to edit a number before calling it. [CHAR LIMIT=48] -->
   <string name="call_details_edit_number">Edit number before call</string>
 
+  <!-- Label for action to report a number with inaccurate caller id information. [CHAR LIMIT=48] -->
+  <string name="call_details_report_call_id">Report inaccurate number</string>
+
   <!-- String shown when the call details show a image that was sent -->
   <string name="sent_a_photo">Sent a photo</string>
 
@@ -36,10 +39,14 @@
   <!-- Messages shown to the user are wrapped in quotes, e.g. the user would see "Some text" -->
   <string name="message_in_quotes">\"<xliff:g id="message">%1$s</xliff:g>\"</string>
 
-  <!-- String describing the button to access the contact details for a name or number.
+  <!-- Title of dialog that confirms whether a user wants to report an incorrect number.
+       [CHAR LIMIT=NONE] -->
+  <string name="report_caller_id_dialog_title">Report incorrect number</string>
 
-      Note: AccessibilityServices use this attribute to announce what the view represents.
-            This is especially valuable for views without textual representation like ImageView.
-  -->
-  <string name="description_contact_photo_details">Contact details for <xliff:g id="nameOrNumber">%1$s</xliff:g></string>
+  <!-- Toast that appears when a caller id report fails to send. Could be due to network error or
+       authentication error. [CHAR LIMIT=NONE] -->
+  <string name="report_caller_id_failed">Couldn\'t report number</string>
+
+  <!-- Toast message which appears when a contact's caller id is reported as incorrect. [CHAR LIMIT=NONE] -->
+  <string name="report_caller_id_toast">Number reported</string>
 </resources>
diff --git a/java/com/android/dialer/callintent/CallIntentBuilder.java b/java/com/android/dialer/callintent/CallIntentBuilder.java
index 6066f66..c9468ba 100644
--- a/java/com/android/dialer/callintent/CallIntentBuilder.java
+++ b/java/com/android/dialer/callintent/CallIntentBuilder.java
@@ -27,6 +27,7 @@
 import android.telecom.VideoProfile;
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.util.CallUtil;
 
 /** Creates an intent to start a new outgoing call. */
@@ -39,9 +40,22 @@
 
   public CallIntentBuilder(@NonNull Uri uri, @NonNull CallSpecificAppData callSpecificAppData) {
     this.uri = Assert.isNotNull(uri);
-    this.callSpecificAppData = Assert.isNotNull(callSpecificAppData);
+    Assert.isNotNull(callSpecificAppData);
     Assert.checkArgument(
         callSpecificAppData.getCallInitiationType() != CallInitiationType.Type.UNKNOWN_INITIATION);
+
+    if (PerformanceReport.isRecording()) {
+      this.callSpecificAppData =
+          CallSpecificAppData.newBuilder(callSpecificAppData)
+              .setTimeSinceAppLaunch(PerformanceReport.getTimeSinceAppLaunch())
+              .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick())
+              .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions())
+              .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps())
+              .build();
+      PerformanceReport.stopRecording();
+    } else {
+      this.callSpecificAppData = callSpecificAppData;
+    }
   }
 
   public CallIntentBuilder(@NonNull Uri uri, CallInitiationType.Type callInitiationType) {
diff --git a/java/com/android/dialer/callintent/call_specific_app_data.proto b/java/com/android/dialer/callintent/call_specific_app_data.proto
index c62006d..766449f 100644
--- a/java/com/android/dialer/callintent/call_specific_app_data.proto
+++ b/java/com/android/dialer/callintent/call_specific_app_data.proto
@@ -8,10 +8,12 @@
 
 import "java/com/android/dialer/callintent/call_initiation_type.proto";
 import "java/com/android/dialer/callintent/speed_dial_contact_type.proto";
+import "java/com/android/dialer/logging/ui_action.proto";
 
 // Miscellaneous data that's included in a new outgoing call initiated by
 // Dialer. The system will pass this data to the InCallUi which can use it
 // for logging or for something else.
+// Next tag: 10
 message CallSpecificAppData {
   optional CallInitiationType.Type call_initiation_type = 1;
 
@@ -21,4 +23,12 @@
 
   repeated SpeedDialContactType.Type speed_dial_contact_type = 4;
   optional int32 speed_dial_contact_position = 5;
+
+  optional int64 time_since_app_launch = 6;
+  optional int64 time_since_first_click = 7;
+  // The following two list should be of the same length
+  // (adding another message is not allowed here)
+  repeated com.android.dialer.logging.UiAction.Type
+      ui_actions_since_app_launch = 8;
+  repeated int64 ui_action_timestamps_since_app_launch = 9;
 }
diff --git a/java/com/android/dialer/callintent/speed_dial_contact_type.proto b/java/com/android/dialer/callintent/speed_dial_contact_type.proto
index d352f45..bf34d09 100644
--- a/java/com/android/dialer/callintent/speed_dial_contact_type.proto
+++ b/java/com/android/dialer/callintent/speed_dial_contact_type.proto
@@ -2,9 +2,10 @@
 
 option java_package = "com.android.dialer.callintent";
 option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
 
 package com.android.dialer.callintent;
-option optimize_for = LITE_RUNTIME;
+
 
 // The type of speed call contact (favorites). Applies to initiation type
 // SPEED_DIAL only.
@@ -16,3 +17,4 @@
     FREQUENT_CONTACT = 3;
   }
 }
+
diff --git a/java/com/android/dialer/calllog/CallLogFramework.java b/java/com/android/dialer/calllog/CallLogFramework.java
index 55ef15b..d3a2c63 100644
--- a/java/com/android/dialer/calllog/CallLogFramework.java
+++ b/java/com/android/dialer/calllog/CallLogFramework.java
@@ -24,8 +24,8 @@
 import com.android.dialer.calllog.datasources.CallLogDataSource;
 import com.android.dialer.calllog.datasources.DataSources;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
diff --git a/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java b/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java
index d25ec5e..2732466 100644
--- a/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java
+++ b/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java
@@ -31,6 +31,7 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.inject.ApplicationContext;
 import javax.inject.Inject;
 
 /**
@@ -44,7 +45,7 @@
   private final DataSources dataSources;
 
   @Inject
-  RefreshAnnotatedCallLogWorker(Context appContext, DataSources dataSources) {
+  RefreshAnnotatedCallLogWorker(@ApplicationContext Context appContext, DataSources dataSources) {
     this.appContext = appContext;
     this.dataSources = dataSources;
   }
@@ -159,11 +160,20 @@
         "applyToDatabase took: %dms",
         System.currentTimeMillis() - startTime);
 
+    for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
+      dataSourceName = getName(dataSource);
+      LogUtil.i("RefreshAnnotatedCallLogWorker.rebuild", "onSuccessfulFill'ing %s", dataSourceName);
+      startTime = System.currentTimeMillis();
+      dataSource.onSuccessfulFill(appContext);
+      LogUtil.i(
+          "CallLogFramework.rebuild",
+          "%s.onSuccessfulFill took: %dms",
+          dataSourceName,
+          System.currentTimeMillis() - startTime);
+    }
+
     SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(appContext);
-    sharedPreferences
-        .edit()
-        .putBoolean(CallLogFramework.PREF_FORCE_REBUILD, false)
-        .commit();
+    sharedPreferences.edit().putBoolean(CallLogFramework.PREF_FORCE_REBUILD, false).apply();
   }
 
   private static String getName(CallLogDataSource dataSource) {
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java
index a9c0d36..30aa2bf 100644
--- a/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java
+++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java
@@ -41,6 +41,13 @@
 /** {@link ContentProvider} for the annotated call log. */
 public class AnnotatedCallLogContentProvider extends ContentProvider {
 
+  /**
+   * We sometimes run queries where we potentially pass every ID into a where clause using the
+   * (?,?,?,...) syntax. The maximum number of host parameters is 999, so that's the maximum size
+   * this table can be. See https://www.sqlite.org/limits.html for more details.
+   */
+  private static final int MAX_ROWS = 999;
+
   private static final int ANNOTATED_CALL_LOG_TABLE_CODE = 1;
   private static final int ANNOTATED_CALL_LOG_TABLE_ID_CODE = 2;
   private static final int COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE = 3;
@@ -72,7 +79,7 @@
 
   @Override
   public boolean onCreate() {
-    databaseHelper = new AnnotatedCallLogDatabaseHelper(getContext());
+    databaseHelper = new AnnotatedCallLogDatabaseHelper(getContext(), MAX_ROWS);
     coalescer = CallLogDatabaseComponent.get(getContext()).coalescer();
     return true;
   }
@@ -283,7 +290,21 @@
             throw new OperationApplicationException("error inserting row");
           }
         } else if (result.count == 0) {
-          throw new OperationApplicationException("error updating or deleting rows");
+          /*
+           * The batches built by MutationApplier happen to contain operations in order of:
+           *
+           * 1. Inserts
+           * 2. Updates
+           * 3. Deletes
+           *
+           * Let's say the last row in the table is row Z, and MutationApplier wishes to update it,
+           * as well as insert row A. When row A gets inserted, row Z will be deleted via the
+           * trigger if the table is full. Then later, when we try to process the update for row Z,
+           * it won't exist.
+           */
+          LogUtil.w(
+              "AnnotatedCallLogContentProvider.applyBatch",
+              "update or delete failed, possibly because row got cleaned up");
         }
         results[i] = result;
       }
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
index 3cca639..887dfcb 100644
--- a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
+++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
@@ -21,28 +21,53 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
 import com.android.dialer.common.LogUtil;
+import java.util.Locale;
 
 /** {@link SQLiteOpenHelper} for the AnnotatedCallLog database. */
 class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper {
+  private final int maxRows;
 
-  AnnotatedCallLogDatabaseHelper(Context appContext) {
+  AnnotatedCallLogDatabaseHelper(Context appContext, int maxRows) {
     super(appContext, "annotated_call_log.db", null, 1);
+    this.maxRows = maxRows;
   }
 
-  private static final String CREATE_SQL =
+  private static final String CREATE_TABLE_SQL =
       new StringBuilder()
           .append("create table if not exists " + AnnotatedCallLog.TABLE + " (")
           .append(AnnotatedCallLog._ID + " integer primary key, ")
           .append(AnnotatedCallLog.TIMESTAMP + " integer, ")
-          .append(AnnotatedCallLog.CONTACT_NAME + " string")
+          .append(AnnotatedCallLog.CONTACT_NAME + " string, ")
+          .append(AnnotatedCallLog.NUMBER + " blob")
           .append(");")
           .toString();
 
+  /** Deletes all but the first maxRows rows (by timestamp) to keep the table a manageable size. */
+  private static final String CREATE_TRIGGER_SQL =
+      "create trigger delete_old_rows after insert on "
+          + AnnotatedCallLog.TABLE
+          + " when (select count(*) from "
+          + AnnotatedCallLog.TABLE
+          + ") > %d"
+          + " begin delete from "
+          + AnnotatedCallLog.TABLE
+          + " where "
+          + AnnotatedCallLog._ID
+          + " in (select "
+          + AnnotatedCallLog._ID
+          + " from "
+          + AnnotatedCallLog.TABLE
+          + " order by timestamp limit (select count(*)-%d"
+          + " from "
+          + AnnotatedCallLog.TABLE
+          + " )); end;";
+
   @Override
   public void onCreate(SQLiteDatabase db) {
     LogUtil.enterBlock("AnnotatedCallLogDatabaseHelper.onCreate");
     long startTime = System.currentTimeMillis();
-    db.execSQL(CREATE_SQL);
+    db.execSQL(CREATE_TABLE_SQL);
+    db.execSQL(String.format(Locale.US, CREATE_TRIGGER_SQL, maxRows, maxRows));
     // TODO: Consider logging impression.
     LogUtil.i(
         "AnnotatedCallLogDatabaseHelper.onCreate",
diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java
index e3dfb7e..5683687 100644
--- a/java/com/android/dialer/calllog/database/Coalescer.java
+++ b/java/com/android/dialer/calllog/database/Coalescer.java
@@ -17,15 +17,18 @@
 
 import android.content.ContentValues;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
 import android.database.MatrixCursor;
 import android.support.annotation.NonNull;
 import android.support.annotation.WorkerThread;
+import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
 import com.android.dialer.calllog.datasources.CallLogDataSource;
 import com.android.dialer.calllog.datasources.DataSources;
 import com.android.dialer.common.Assert;
+import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -64,6 +67,9 @@
     // Note: This method relies on rowsShouldBeCombined to determine which rows should be combined,
     // but delegates to data sources to actually aggregate column values.
 
+    DialerPhoneNumberUtil dialerPhoneNumberUtil =
+        new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance());
+
     MatrixCursor allCoalescedRowsMatrixCursor =
         new MatrixCursor(
             CoalescedAnnotatedCallLog.ALL_COLUMNS,
@@ -75,9 +81,8 @@
       List<ContentValues> currentRowGroup = new ArrayList<>();
 
       do {
-        ContentValues currentRow = new ContentValues();
-        DatabaseUtils.cursorRowToContentValues(
-            allAnnotatedCallLogRowsSortedByTimestampDesc, currentRow);
+        ContentValues currentRow =
+            cursorRowToContentValues(allAnnotatedCallLogRowsSortedByTimestampDesc);
 
         if (currentRowGroup.isEmpty()) {
           currentRowGroup.add(currentRow);
@@ -86,7 +91,7 @@
 
         ContentValues previousRow = currentRowGroup.get(currentRowGroup.size() - 1);
 
-        if (!rowsShouldBeCombined(previousRow, currentRow)) {
+        if (!rowsShouldBeCombined(dialerPhoneNumberUtil, previousRow, currentRow)) {
           ContentValues coalescedRow = coalesceRowsForAllDataSources(currentRowGroup);
           coalescedRow.put(CoalescedAnnotatedCallLog.NUMBER_CALLS, currentRowGroup.size());
           addContentValuesToMatrixCursor(
@@ -104,13 +109,46 @@
     return allCoalescedRowsMatrixCursor;
   }
 
+  private static ContentValues cursorRowToContentValues(Cursor cursor) {
+    ContentValues values = new ContentValues();
+    String[] columns = cursor.getColumnNames();
+    int length = columns.length;
+    for (int i = 0; i < length; i++) {
+      if (cursor.getType(i) == Cursor.FIELD_TYPE_BLOB) {
+        values.put(columns[i], cursor.getBlob(i));
+      } else {
+        values.put(columns[i], cursor.getString(i));
+      }
+    }
+    return values;
+  }
+
   /**
    * @param row1 a row from {@link AnnotatedCallLog}
    * @param row2 a row from {@link AnnotatedCallLog}
    */
-  private static boolean rowsShouldBeCombined(ContentValues row1, ContentValues row2) {
+  private static boolean rowsShouldBeCombined(
+      DialerPhoneNumberUtil dialerPhoneNumberUtil, ContentValues row1, ContentValues row2) {
     // TODO: Real implementation.
-    return row1.get(AnnotatedCallLog.TIMESTAMP).equals(row2.get(AnnotatedCallLog.TIMESTAMP));
+    DialerPhoneNumber number1;
+    DialerPhoneNumber number2;
+    try {
+      number1 = DialerPhoneNumber.parseFrom(row1.getAsByteArray(AnnotatedCallLog.NUMBER));
+      number2 = DialerPhoneNumber.parseFrom(row2.getAsByteArray(AnnotatedCallLog.NUMBER));
+    } catch (InvalidProtocolBufferException e) {
+      throw Assert.createAssertionFailException("error parsing DialerPhoneNumber proto", e);
+    }
+
+    if (!number1.hasDialerInternalPhoneNumber() && !number2.hasDialerInternalPhoneNumber()) {
+      // Empty numbers should not be combined.
+      return false;
+    }
+
+    if (!number1.hasDialerInternalPhoneNumber() || !number2.hasDialerInternalPhoneNumber()) {
+      // An empty number should not be combined with a non-empty number.
+      return false;
+    }
+    return dialerPhoneNumberUtil.isExactMatch(number1, number2);
   }
 
   /**
diff --git a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java
index 8b3b0a8..7f314e3 100644
--- a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java
+++ b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java
@@ -66,6 +66,18 @@
 
     /** The MIME type of a {@link android.content.ContentProvider#getType(Uri)} single entry. */
     public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/annotated_call_log";
+
+    /**
+     * The phone number called or number the call came from, encoded as a {@link
+     * com.android.dialer.DialerPhoneNumber} proto. The number may be empty if it was an incoming
+     * call and the number was unknown.
+     *
+     * <p>This column is only present in the annotated call log, and not the coalesced annotated
+     * call log. The coalesced version uses a formatted number string rather than proto bytes.
+     *
+     * <p>Type: BLOB
+     */
+    public static final String NUMBER = "number";
   }
 
   /**
@@ -96,10 +108,19 @@
     public static final String NUMBER_CALLS = "number_calls";
 
     /**
+     * The phone number formatted in a way suitable for display to the user. This value is generated
+     * on the fly when the {@link CoalescedAnnotatedCallLog} is generated.
+     *
+     * <p>Type: TEXT
+     */
+    public static final String FORMATTED_NUMBER = "formatted_number";
+
+    /**
      * Columns that are only in the {@link CoalescedAnnotatedCallLog} but not the {@link
      * AnnotatedCallLog}.
      */
-    private static final String[] COLUMNS_ONLY_IN_COALESCED_CALL_LOG = new String[] {NUMBER_CALLS};
+    private static final String[] COLUMNS_ONLY_IN_COALESCED_CALL_LOG =
+        new String[] {NUMBER_CALLS, FORMATTED_NUMBER};
 
     /** All columns in the {@link CoalescedAnnotatedCallLog}. */
     public static final String[] ALL_COLUMNS =
diff --git a/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java b/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java
index e9538da..82a8523 100644
--- a/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java
@@ -50,6 +50,9 @@
       CallLogMutations mutations) {
     Assert.isWorkerThread();
     // TODO: Implementation.
+    for (ContentValues contentValues : mutations.getInserts().values()) {
+      contentValues.put(AnnotatedCallLog.CONTACT_NAME, "Placeholder name");
+    }
   }
 
   @Override
diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
index be2df60..f206328 100644
--- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
@@ -34,14 +34,19 @@
 import android.support.annotation.WorkerThread;
 import android.text.TextUtils;
 import android.util.ArraySet;
+import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
 import com.android.dialer.calllog.datasources.CallLogDataSource;
 import com.android.dialer.calllog.datasources.CallLogMutations;
 import com.android.dialer.calllog.datasources.util.RowCombiner;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
 import com.android.dialer.util.PermissionsUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -132,16 +137,39 @@
       PreferenceManager.getDefaultSharedPreferences(appContext)
           .edit()
           .putLong(PREF_LAST_TIMESTAMP_PROCESSED, lastTimestampProcessed)
-          .commit();
+          .apply();
     }
   }
 
   @Override
   public ContentValues coalesce(List<ContentValues> individualRowsSortedByTimestampDesc) {
     // TODO: Complete implementation.
-    return new RowCombiner(individualRowsSortedByTimestampDesc)
-        .useMostRecentLong(AnnotatedCallLog.TIMESTAMP)
-        .combine();
+    ContentValues coalescedValues =
+        new RowCombiner(individualRowsSortedByTimestampDesc)
+            .useMostRecentLong(AnnotatedCallLog.TIMESTAMP)
+            .combine();
+
+    // All phone numbers in the provided group should be equivalent (but could be formatted
+    // differently). Arbitrarily show the raw phone number of the most recent call.
+    DialerPhoneNumber mostRecentPhoneNumber =
+        getMostRecentPhoneNumber(individualRowsSortedByTimestampDesc);
+    coalescedValues.put(
+        CoalescedAnnotatedCallLog.FORMATTED_NUMBER,
+        mostRecentPhoneNumber.getRawInput().getNumber());
+    return coalescedValues;
+  }
+
+  private static DialerPhoneNumber getMostRecentPhoneNumber(
+      List<ContentValues> individualRowsSortedByTimestampDesc) {
+    DialerPhoneNumber dialerPhoneNumber;
+    byte[] protoBytes =
+        individualRowsSortedByTimestampDesc.get(0).getAsByteArray(AnnotatedCallLog.NUMBER);
+    try {
+      dialerPhoneNumber = DialerPhoneNumber.parseFrom(protoBytes);
+    } catch (InvalidProtocolBufferException e) {
+      throw Assert.createAssertionFailException("couldn't parse DialerPhoneNumber", e);
+    }
+    return dialerPhoneNumber;
   }
 
   @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
@@ -151,12 +179,18 @@
         PreferenceManager.getDefaultSharedPreferences(appContext)
             .getLong(PREF_LAST_TIMESTAMP_PROCESSED, 0L);
 
+    DialerPhoneNumberUtil dialerPhoneNumberUtil =
+        new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance());
+
+    // TODO: Really should be getting last 1000 by timestamp, not by last modified.
     try (Cursor cursor =
         appContext
             .getContentResolver()
             .query(
                 Calls.CONTENT_URI, // Excludes voicemail
-                new String[] {Calls._ID, Calls.DATE, Calls.LAST_MODIFIED},
+                new String[] {
+                  Calls._ID, Calls.DATE, Calls.LAST_MODIFIED, Calls.NUMBER, Calls.COUNTRY_ISO
+                },
                 Calls.LAST_MODIFIED + " > ?",
                 new String[] {String.valueOf(previousTimestampProcessed)},
                 Calls.LAST_MODIFIED + " DESC LIMIT 1000")) {
@@ -175,6 +209,8 @@
         int idColumn = cursor.getColumnIndexOrThrow(Calls._ID);
         int dateColumn = cursor.getColumnIndexOrThrow(Calls.DATE);
         int lastModifiedColumn = cursor.getColumnIndexOrThrow(Calls.LAST_MODIFIED);
+        int numberColumn = cursor.getColumnIndexOrThrow(Calls.NUMBER);
+        int countryIsoColumn = cursor.getColumnIndexOrThrow(Calls.COUNTRY_ISO);
 
         // The cursor orders by LAST_MODIFIED DESC, so the first result is the most recent timestamp
         // processed.
@@ -182,9 +218,15 @@
         do {
           long id = cursor.getLong(idColumn);
           long date = cursor.getLong(dateColumn);
+          String numberAsStr = cursor.getString(numberColumn);
+          String countryIso = cursor.getString(countryIsoColumn);
+
+          byte[] numberAsProtoBytes =
+              dialerPhoneNumberUtil.parse(numberAsStr, countryIso).toByteArray();
 
           ContentValues contentValues = new ContentValues();
           contentValues.put(AnnotatedCallLog.TIMESTAMP, date);
+          contentValues.put(AnnotatedCallLog.NUMBER, numberAsProtoBytes);
 
           if (existingAnnotatedCallLogIds.contains(id)) {
             mutations.update(id, contentValues);
@@ -202,7 +244,7 @@
         getIdsFromSystemCallLogThatMatch(appContext, existingAnnotatedCallLogIds);
     LogUtil.i(
         "SystemCallLogDataSource.handleDeletes",
-        "found %d entries in system call log",
+        "found %d matching entries in system call log",
         systemCallLogIds.size());
     Set<Long> idsInAnnotatedCallLogNoLongerInSystemCallLog = new ArraySet<>();
     idsInAnnotatedCallLogNoLongerInSystemCallLog.addAll(existingAnnotatedCallLogIds);
diff --git a/java/com/android/dialer/calllog/testing/FakeCallLogApplication.java b/java/com/android/dialer/calllog/testing/FakeCallLogApplication.java
index cb22405..8aee7dd 100644
--- a/java/com/android/dialer/calllog/testing/FakeCallLogApplication.java
+++ b/java/com/android/dialer/calllog/testing/FakeCallLogApplication.java
@@ -16,8 +16,12 @@
 package com.android.dialer.calllog.testing;
 
 import android.app.Application;
+import com.android.dialer.calllog.CallLogComponent;
 import com.android.dialer.calllog.CallLogModule;
 import com.android.dialer.calllog.database.CallLogDatabaseComponent;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.concurrent.testing.TestDialerExecutorModule;
+import com.android.dialer.inject.ContextModule;
 import com.android.dialer.inject.HasRootComponent;
 import dagger.Component;
 import javax.inject.Singleton;
@@ -27,13 +31,23 @@
  * tests to depend on and use all of DialerApplication.
  */
 public final class FakeCallLogApplication extends Application implements HasRootComponent {
+  private Object rootComponent;
 
   @Override
-  public Object component() {
-    return DaggerFakeCallLogApplication_FakeComponent.create();
+  public final synchronized Object component() {
+    if (rootComponent == null) {
+      rootComponent =
+          DaggerFakeCallLogApplication_FakeComponent.builder()
+              .contextModule(new ContextModule(this))
+              .build();
+    }
+    return rootComponent;
   }
 
   @Singleton
-  @Component(modules = CallLogModule.class)
-  interface FakeComponent extends CallLogDatabaseComponent.HasComponent {}
+  @Component(modules = {CallLogModule.class, ContextModule.class, TestDialerExecutorModule.class})
+  interface FakeComponent
+      extends CallLogDatabaseComponent.HasComponent,
+          CallLogComponent.HasComponent,
+          DialerExecutorComponent.HasComponent {}
 }
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
index 89ed52f..712f7cf 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
@@ -39,6 +39,14 @@
 public final class NewCallLogFragment extends Fragment
     implements CallLogUi, LoaderCallbacks<Cursor> {
 
+  /*
+   * This is a reasonable time that it might take between related call log writes, that also
+   * shouldn't slow down single-writes too much. For example, when populating the database using
+   * the simulator, using this value results in ~6 refresh cycles (on a release build) to write 120
+   * call log entries.
+   */
+  private static final long WAIT_MILLIS = 100L;
+
   private DialerExecutor<Boolean> refreshAnnotatedCallLogTask;
   private RecyclerView recyclerView;
 
@@ -113,13 +121,13 @@
 
   private void checkAnnotatedCallLogDirtyAndRefreshIfNecessary() {
     LogUtil.enterBlock("NewCallLogFragment.checkAnnotatedCallLogDirtyAndRefreshIfNecessary");
-    refreshAnnotatedCallLogTask.executeSerial(false /* skipDirtyCheck */);
+    refreshAnnotatedCallLogTask.executeSerialWithWait(false /* skipDirtyCheck */, WAIT_MILLIS);
   }
 
   @Override
   public void invalidateUi() {
     LogUtil.enterBlock("NewCallLogFragment.invalidateUi");
-    refreshAnnotatedCallLogTask.executeSerial(true /* skipDirtyCheck */);
+    refreshAnnotatedCallLogTask.executeSerialWithWait(true /* skipDirtyCheck */, WAIT_MILLIS);
   }
 
   @Override
diff --git a/java/com/android/dialer/common/Assert.java b/java/com/android/dialer/common/Assert.java
index 943e1dd..2d7f199 100644
--- a/java/com/android/dialer/common/Assert.java
+++ b/java/com/android/dialer/common/Assert.java
@@ -59,6 +59,11 @@
   }
 
   @CheckReturnValue
+  public static AssertionError createAssertionFailException(String msg, Throwable reason) {
+    return new AssertionError(msg, reason);
+  }
+
+  @CheckReturnValue
   public static UnsupportedOperationException createUnsupportedOperationFailException() {
     return new UnsupportedOperationException();
   }
diff --git a/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java b/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java
index 4b6d81a..82e517d 100644
--- a/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java
+++ b/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java
@@ -17,6 +17,7 @@
 package com.android.dialer.common.concurrent;
 
 import android.app.FragmentManager;
+import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
@@ -25,9 +26,13 @@
 import com.android.dialer.common.concurrent.DialerExecutor.FailureListener;
 import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 
 /** The production {@link DialerExecutorFactory}. */
@@ -62,16 +67,16 @@
         throwable -> {
           throw new RuntimeException(throwable);
         };
-    @Nullable final ExecutorService serialExecutorService;
-    @Nullable final ExecutorService parallelExecutorService;
+    @Nullable final ScheduledExecutorService serialExecutorService;
+    @Nullable final Executor parallelExecutor;
 
     BaseTaskBuilder(
         Worker<InputT, OutputT> worker,
-        @Nullable ExecutorService serialExecutorService,
-        @Nullable ExecutorService parallelExecutorService) {
+        @Nullable ScheduledExecutorService serialExecutorService,
+        @Nullable Executor parallelExecutor) {
       this.worker = worker;
       this.serialExecutorService = serialExecutorService;
-      this.parallelExecutorService = parallelExecutorService;
+      this.parallelExecutor = parallelExecutor;
     }
 
     @NonNull
@@ -91,6 +96,19 @@
 
   /** Convenience class for use by {@link DialerExecutorFactory} implementations. */
   public static class UiTaskBuilder<InputT, OutputT> extends BaseTaskBuilder<InputT, OutputT> {
+    private static final ScheduledExecutorService defaultSerialExecutorService =
+        Executors.newSingleThreadScheduledExecutor(
+            new ThreadFactory() {
+              @Override
+              public Thread newThread(Runnable runnable) {
+                LogUtil.i("UiTaskBuilder.newThread", "creating serial thread");
+                Thread thread = new Thread(runnable, "UiTaskBuilder-Serial");
+                thread.setPriority(5); // Corresponds to Process.THREAD_PRIORITY_DEFAULT
+                return thread;
+              }
+            });
+
+    private static final Executor defaultParallelExecutorService = AsyncTask.THREAD_POOL_EXECUTOR;
 
     private final FragmentManager fragmentManager;
     private final String id;
@@ -102,16 +120,16 @@
           fragmentManager,
           id,
           worker,
-          null /* serialExecutorService */,
-          null /* parallelExecutorService */);
+          defaultSerialExecutorService,
+          defaultParallelExecutorService);
     }
 
     public UiTaskBuilder(
         FragmentManager fragmentManager,
         String id,
         Worker<InputT, OutputT> worker,
-        ExecutorService serialExecutor,
-        ExecutorService parallelExecutor) {
+        ScheduledExecutorService serialExecutor,
+        Executor parallelExecutor) {
       super(worker, serialExecutor, parallelExecutor);
       this.fragmentManager = fragmentManager;
       this.id = id;
@@ -128,46 +146,46 @@
               super.successListener,
               super.failureListener,
               serialExecutorService,
-              parallelExecutorService);
+              parallelExecutor);
       return new UiDialerExecutor<>(dialerUiTaskFragment);
     }
   }
 
   /** Convenience class for use by {@link DialerExecutorFactory} implementations. */
   public static class NonUiTaskBuilder<InputT, OutputT> extends BaseTaskBuilder<InputT, OutputT> {
-    private static final ExecutorService defaultSerialExecutorService =
-        Executors.newSingleThreadExecutor(
+    private static final ScheduledExecutorService defaultSerialExecutorService =
+        Executors.newSingleThreadScheduledExecutor(
             new ThreadFactory() {
               @Override
               public Thread newThread(Runnable runnable) {
                 LogUtil.i("NonUiTaskBuilder.newThread", "creating serial thread");
-                Thread thread = new Thread(runnable, "NonUiTaskBuilder");
+                Thread thread = new Thread(runnable, "NonUiTaskBuilder-Serial");
                 thread.setPriority(4); // Corresponds to Process.THREAD_PRIORITY_BACKGROUND
                 return thread;
               }
             });
 
-    private static final ExecutorService defaultParallelExecutorService =
+    private static final Executor defaultParallelExecutor =
         Executors.newFixedThreadPool(
             5,
             new ThreadFactory() {
               @Override
               public Thread newThread(Runnable runnable) {
                 LogUtil.i("NonUiTaskBuilder.newThread", "creating parallel thread");
-                Thread thread = new Thread(runnable, "NonUiTaskBuilder");
+                Thread thread = new Thread(runnable, "NonUiTaskBuilder-Parallel");
                 thread.setPriority(4); // Corresponds to Process.THREAD_PRIORITY_BACKGROUND
                 return thread;
               }
             });
 
     NonUiTaskBuilder(Worker<InputT, OutputT> worker) {
-      this(worker, defaultSerialExecutorService, defaultParallelExecutorService);
+      this(worker, defaultSerialExecutorService, defaultParallelExecutor);
     }
 
     public NonUiTaskBuilder(
         Worker<InputT, OutputT> worker,
-        @NonNull ExecutorService serialExecutor,
-        @NonNull ExecutorService parallelExecutor) {
+        @NonNull ScheduledExecutorService serialExecutor,
+        @NonNull Executor parallelExecutor) {
       super(worker, Assert.isNotNull(serialExecutor), Assert.isNotNull(parallelExecutor));
     }
 
@@ -179,7 +197,7 @@
           super.successListener,
           super.failureListener,
           serialExecutorService,
-          parallelExecutorService);
+          parallelExecutor);
     }
   }
 
@@ -197,6 +215,11 @@
     }
 
     @Override
+    public void executeSerialWithWait(@Nullable InputT input, long waitMillis) {
+      dialerUiTaskFragment.executeSerialWithWait(input, waitMillis);
+    }
+
+    @Override
     public void executeParallel(@Nullable InputT input) {
       dialerUiTaskFragment.executeParallel(input);
     }
@@ -214,47 +237,59 @@
     private final SuccessListener<OutputT> successListener;
     private final FailureListener failureListener;
 
-    private final ExecutorService serialExecutorService;
-    private final ExecutorService parallelExecutorService;
+    private final ScheduledExecutorService serialExecutorService;
+    private final Executor parallelExecutor;
+
+    private ScheduledFuture<?> scheduledFuture;
 
     NonUiDialerExecutor(
         Worker<InputT, OutputT> worker,
         SuccessListener<OutputT> successListener,
         FailureListener failureListener,
-        ExecutorService serialExecutorService,
-        ExecutorService parallelExecutorService) {
+        ScheduledExecutorService serialExecutorService,
+        Executor parallelExecutor) {
       this.worker = worker;
       this.successListener = successListener;
       this.failureListener = failureListener;
       this.serialExecutorService = serialExecutorService;
-      this.parallelExecutorService = parallelExecutorService;
+      this.parallelExecutor = parallelExecutor;
     }
 
     @Override
     public void executeSerial(@Nullable InputT input) {
-      executeOnCustomExecutorService(serialExecutorService, input);
+      serialExecutorService.execute(() -> run(input));
+    }
+
+    @Override
+    public void executeSerialWithWait(@Nullable InputT input, long waitMillis) {
+      if (scheduledFuture != null) {
+        LogUtil.i("NonUiDialerExecutor.executeSerialWithWait", "cancelling waiting task");
+        scheduledFuture.cancel(false /* mayInterrupt */);
+      }
+      scheduledFuture =
+          serialExecutorService.schedule(() -> run(input), waitMillis, TimeUnit.MILLISECONDS);
     }
 
     @Override
     public void executeParallel(@Nullable InputT input) {
-      executeOnCustomExecutorService(parallelExecutorService, input);
+      parallelExecutor.execute(() -> run(input));
     }
 
     @Override
     public void executeOnCustomExecutorService(
         @NonNull ExecutorService executorService, @Nullable InputT input) {
-      Assert.isNotNull(executorService)
-          .execute(
-              () -> {
-                OutputT output;
-                try {
-                  output = worker.doInBackground(input);
-                } catch (Throwable throwable) {
-                  ThreadUtil.postOnUiThread(() -> failureListener.onFailure(throwable));
-                  return;
-                }
-                ThreadUtil.postOnUiThread(() -> successListener.onSuccess(output));
-              });
+      Assert.isNotNull(executorService).execute(() -> run(input));
+    }
+
+    private void run(@Nullable InputT input) {
+      OutputT output;
+      try {
+        output = worker.doInBackground(input);
+      } catch (Throwable throwable) {
+        ThreadUtil.postOnUiThread(() -> failureListener.onFailure(throwable));
+        return;
+      }
+      ThreadUtil.postOnUiThread(() -> successListener.onSuccess(output));
     }
   }
 }
diff --git a/java/com/android/dialer/common/concurrent/DialerExecutor.java b/java/com/android/dialer/common/concurrent/DialerExecutor.java
index 0237e3a..0414581 100644
--- a/java/com/android/dialer/common/concurrent/DialerExecutor.java
+++ b/java/com/android/dialer/common/concurrent/DialerExecutor.java
@@ -84,6 +84,16 @@
   void executeSerial(@Nullable InputT input);
 
   /**
+   * Executes the task after waiting {@code waitMillis}. If called while the previous invocation is
+   * still waiting to be started, the original invocation is cancelled.
+   *
+   * <p>This is useful for tasks which might get scheduled many times in very quick succession, but
+   * it is only the last one that actually needs to be executed.
+   */
+  @MainThread
+  void executeSerialWithWait(@Nullable InputT input, long waitMillis);
+
+  /**
    * Executes the task on a thread pool shared across the application. Multiple calls using this
    * method may result in tasks being executed in parallel.
    */
diff --git a/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java b/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java
index 6273368..7f2a5a0 100644
--- a/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java
+++ b/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java
@@ -18,17 +18,21 @@
 
 import android.app.Fragment;
 import android.app.FragmentManager;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.AsyncTaskExecutors.SimpleAsyncTaskExecutor;
 import com.android.dialer.common.concurrent.DialerExecutor.FailureListener;
 import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Do not use this class directly. Instead use {@link DialerExecutors}.
@@ -38,13 +42,13 @@
  */
 public final class DialerUiTaskFragment<InputT, OutputT> extends Fragment {
 
-  private String taskId;
   private Worker<InputT, OutputT> worker;
   private SuccessListener<OutputT> successListener;
   private FailureListener failureListener;
 
-  private AsyncTaskExecutor serialExecutor = AsyncTaskExecutors.createAsyncTaskExecutor();
-  private AsyncTaskExecutor parallelExecutor = AsyncTaskExecutors.createThreadPoolExecutor();
+  private ScheduledExecutorService serialExecutor;
+  private Executor parallelExecutor;
+  private ScheduledFuture<?> scheduledFuture;
 
   /**
    * Creates a new {@link DialerUiTaskFragment} or gets an existing one in the event that a
@@ -76,8 +80,8 @@
       Worker<InputT, OutputT> worker,
       SuccessListener<OutputT> successListener,
       FailureListener failureListener,
-      @Nullable ExecutorService serialExecutorService,
-      @Nullable ExecutorService parallelExecutorService) {
+      @NonNull ScheduledExecutorService serialExecutorService,
+      @NonNull Executor parallelExecutor) {
     Assert.isMainThread();
 
     DialerUiTaskFragment<InputT, OutputT> fragment =
@@ -88,16 +92,11 @@
       fragment = new DialerUiTaskFragment<>();
       fragmentManager.beginTransaction().add(fragment, taskId).commit();
     }
-    fragment.taskId = taskId;
     fragment.worker = worker;
     fragment.successListener = successListener;
     fragment.failureListener = failureListener;
-    if (serialExecutorService != null) {
-      fragment.serialExecutor = new SimpleAsyncTaskExecutor(serialExecutorService);
-    }
-    if (parallelExecutorService != null) {
-      fragment.parallelExecutor = new SimpleAsyncTaskExecutor(parallelExecutorService);
-    }
+    fragment.serialExecutor = Assert.isNotNull(serialExecutorService);
+    fragment.parallelExecutor = Assert.isNotNull(parallelExecutor);
     return fragment;
   }
 
@@ -111,60 +110,51 @@
   public void onDetach() {
     super.onDetach();
     LogUtil.enterBlock("DialerUiTaskFragment.onDetach");
-    taskId = null;
     successListener = null;
     failureListener = null;
+    if (scheduledFuture != null) {
+      scheduledFuture.cancel(false /* mayInterrupt */);
+      scheduledFuture = null;
+    }
   }
 
   void executeSerial(InputT input) {
-    serialExecutor.submit(taskId, new InternalTask(), input);
+    serialExecutor.execute(() -> runTask(input));
+  }
+
+  void executeSerialWithWait(InputT input, long waitMillis) {
+    if (scheduledFuture != null) {
+      LogUtil.i("DialerUiTaskFragment.executeSerialWithWait", "cancelling waiting task");
+      scheduledFuture.cancel(false /* mayInterrupt */);
+    }
+    scheduledFuture =
+        serialExecutor.schedule(() -> runTask(input), waitMillis, TimeUnit.MILLISECONDS);
   }
 
   void executeParallel(InputT input) {
-    parallelExecutor.submit(taskId, new InternalTask(), input);
+    parallelExecutor.execute(() -> runTask(input));
   }
 
   void executeOnCustomExecutor(ExecutorService executor, InputT input) {
-    new SimpleAsyncTaskExecutor(executor).submit(taskId, new InternalTask(), input);
+    executor.execute(() -> runTask(input));
   }
 
-  private final class InternalTask extends AsyncTask<InputT, Void, InternalTaskResult<OutputT>> {
-
-    @SafeVarargs
-    @Override
-    protected final InternalTaskResult<OutputT> doInBackground(InputT... params) {
-      try {
-        return new InternalTaskResult<>(null, worker.doInBackground(params[0]));
-      } catch (Throwable throwable) {
-        LogUtil.e("InternalTask.doInBackground", "task failed", throwable);
-        return new InternalTaskResult<>(throwable, null);
-      }
-    }
-
-    @Override
-    protected void onPostExecute(InternalTaskResult<OutputT> result) {
-      if (result.throwable != null) {
-        if (failureListener == null) {
-          LogUtil.i("InternalTask.onPostExecute", "task failed but UI is dead");
-        } else {
-          failureListener.onFailure(result.throwable);
-        }
-      } else if (successListener == null) {
-        LogUtil.i("InternalTask.onPostExecute", "task succeeded but UI is dead");
+  @WorkerThread
+  private void runTask(@Nullable InputT input) {
+    try {
+      OutputT output = worker.doInBackground(input);
+      if (successListener == null) {
+        LogUtil.i("DialerUiTaskFragment.runTask", "task succeeded but UI is dead");
       } else {
-        successListener.onSuccess(result.result);
+        ThreadUtil.postOnUiThread(() -> successListener.onSuccess(output));
       }
-    }
-  }
-
-  private static class InternalTaskResult<OutputT> {
-
-    private final Throwable throwable;
-    private final OutputT result;
-
-    InternalTaskResult(Throwable throwable, OutputT result) {
-      this.throwable = throwable;
-      this.result = result;
+    } catch (Throwable throwable) {
+      LogUtil.e("DialerUiTaskFragment.runTask", "task failed", throwable);
+      if (failureListener == null) {
+        LogUtil.i("DialerUiTaskFragment.runTask", "task failed but UI is dead");
+      } else {
+        ThreadUtil.postOnUiThread(() -> failureListener.onFailure(throwable));
+      }
     }
   }
 }
diff --git a/java/com/android/dialer/common/concurrent/ThreadUtil.java b/java/com/android/dialer/common/concurrent/ThreadUtil.java
index 21cf463..39b6cce 100644
--- a/java/com/android/dialer/common/concurrent/ThreadUtil.java
+++ b/java/com/android/dialer/common/concurrent/ThreadUtil.java
@@ -28,6 +28,11 @@
     getUiThreadHandler().post(runnable);
   }
 
+  /** Posts a runnable to the UI thread, to be run after the specified amount of time elapses. */
+  public static void postDelayedOnUiThread(Runnable runnable, long delayMillis) {
+    getUiThreadHandler().postDelayed(runnable, delayMillis);
+  }
+
   /** Gets a handler which uses the main looper. */
   public static Handler getUiThreadHandler() {
     if (mainThreadHandler == null) {
diff --git a/java/com/android/dialer/configprovider/AndroidManifest.xml b/java/com/android/dialer/configprovider/AndroidManifest.xml
new file mode 100644
index 0000000..7729971
--- /dev/null
+++ b/java/com/android/dialer/configprovider/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ 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
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.configprovider">
+
+  <application>
+    <service android:name=".SharedPrefConfigProvider$Service"/>
+  </application>
+
+</manifest>
\ No newline at end of file
diff --git a/java/com/android/dialer/common/ConfigProvider.java b/java/com/android/dialer/configprovider/ConfigProvider.java
similarity index 95%
rename from java/com/android/dialer/common/ConfigProvider.java
rename to java/com/android/dialer/configprovider/ConfigProvider.java
index c0791e9..886a69e 100644
--- a/java/com/android/dialer/common/ConfigProvider.java
+++ b/java/com/android/dialer/configprovider/ConfigProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.common;
+package com.android.dialer.configprovider;
 
 /** Gets config values from the container application. */
 public interface ConfigProvider {
diff --git a/java/com/android/dialer/common/ConfigProviderBindings.java b/java/com/android/dialer/configprovider/ConfigProviderBindings.java
similarity index 85%
rename from java/com/android/dialer/common/ConfigProviderBindings.java
rename to java/com/android/dialer/configprovider/ConfigProviderBindings.java
index 9f045ad..0bf0e75 100644
--- a/java/com/android/dialer/common/ConfigProviderBindings.java
+++ b/java/com/android/dialer/configprovider/ConfigProviderBindings.java
@@ -14,13 +14,14 @@
  * limitations under the License
  */
 
-package com.android.dialer.common;
+package com.android.dialer.configprovider;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.os.UserManagerCompat;
+import com.android.dialer.common.Assert;
 
 /** Accessor for getting a {@link ConfigProvider}. */
 public class ConfigProviderBindings {
@@ -39,16 +40,7 @@
       }
       return configProviderStub;
     }
-
-    Context application = context.getApplicationContext();
-    if (application instanceof ConfigProviderFactory) {
-      configProvider = ((ConfigProviderFactory) application).getConfigProvider();
-    }
-
-    if (configProvider == null) {
-      configProvider = new ConfigProviderStub();
-    }
-
+    configProvider = ConfigProviderComponent.get(context).getConfigProvider();
     return configProvider;
   }
 
diff --git a/java/com/android/dialer/configprovider/ConfigProviderComponent.java b/java/com/android/dialer/configprovider/ConfigProviderComponent.java
new file mode 100644
index 0000000..e26a5cf
--- /dev/null
+++ b/java/com/android/dialer/configprovider/ConfigProviderComponent.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+package com.android.dialer.configprovider;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import com.android.dialer.inject.HasRootComponent;
+import dagger.Subcomponent;
+
+/** Dagger component to provide a {@link ConfigProvider}. */
+@Subcomponent
+public abstract class ConfigProviderComponent {
+
+  @NonNull
+  public abstract ConfigProvider getConfigProvider();
+
+  public static ConfigProviderComponent get(Context context) {
+    return ((ConfigProviderComponent.HasComponent)
+            ((HasRootComponent) context.getApplicationContext()).component())
+        .configProviderComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    ConfigProviderComponent configProviderComponent();
+  }
+}
diff --git a/java/com/android/dialer/configprovider/SharedPrefConfigProvider.java b/java/com/android/dialer/configprovider/SharedPrefConfigProvider.java
new file mode 100644
index 0000000..fad25a4
--- /dev/null
+++ b/java/com/android/dialer/configprovider/SharedPrefConfigProvider.java
@@ -0,0 +1,131 @@
+/*
+ * 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
+ */
+package com.android.dialer.configprovider;
+
+import android.app.IntentService;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.os.StrictMode;
+import android.support.annotation.Nullable;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.util.DialerUtils;
+import javax.inject.Inject;
+
+/**
+ * {@link ConfigProvider} which uses a shared preferences file.
+ *
+ * <p>Config flags can be written using adb (with root access), for example:
+ *
+ * <pre>
+ *   adb root
+ *   adb shell am startservice -n \
+ *     'com.android.dialer/.configprovider.SharedPrefConfigProvider\$Service' \
+ *     --ez boolean_flag_name flag_value
+ * </pre>
+ *
+ * <p>(For longs use --el and for strings use --es.)
+ *
+ * <p>Flags can be viewed with:
+ *
+ * <pre>
+ *   adb shell cat \
+ *     /data/user_de/0/com.android.dialer/shared_prefs/com.android.dialer_preferences.xml
+ * </pre>
+ */
+class SharedPrefConfigProvider implements ConfigProvider {
+  private static final String PREF_PREFIX = "config_provider_prefs_";
+
+  private final Context appContext;
+
+  @Inject
+  SharedPrefConfigProvider(@ApplicationContext Context appContext) {
+    this.appContext = appContext;
+  }
+
+  /** Service to write values into {@link SharedPrefConfigProvider} using adb. */
+  public static class Service extends IntentService {
+
+    public Service() {
+      super("SharedPrefConfigProvider.Service");
+    }
+
+    @Override
+    protected void onHandleIntent(@Nullable Intent intent) {
+      if (intent == null || intent.getExtras() == null || intent.getExtras().size() != 1) {
+        LogUtil.w("SharedPrefConfigProvider.Service.onHandleIntent", "must set exactly one extra");
+        return;
+      }
+      String key = intent.getExtras().keySet().iterator().next();
+      Object value = intent.getExtras().get(key);
+      put(key, value);
+    }
+
+    private void put(String key, Object value) {
+      Editor editor = getSharedPrefs(getApplicationContext()).edit();
+      String prefixedKey = PREF_PREFIX + key;
+      if (value instanceof Boolean) {
+        editor.putBoolean(prefixedKey, (Boolean) value);
+      } else if (value instanceof Long) {
+        editor.putLong(prefixedKey, (Long) value);
+      } else if (value instanceof String) {
+        editor.putString(prefixedKey, (String) value);
+      } else {
+        throw Assert.createAssertionFailException("unsupported extra type: " + value.getClass());
+      }
+      editor.apply();
+    }
+  }
+
+  @Override
+  public String getString(String key, String defaultValue) {
+    return bypassStrictMode(
+        () -> getSharedPrefs(appContext).getString(PREF_PREFIX + key, defaultValue));
+  }
+
+  @Override
+  public long getLong(String key, long defaultValue) {
+    return bypassStrictMode(
+        () -> getSharedPrefs(appContext).getLong(PREF_PREFIX + key, defaultValue));
+  }
+
+  @Override
+  public boolean getBoolean(String key, boolean defaultValue) {
+    return bypassStrictMode(
+        () -> getSharedPrefs(appContext).getBoolean(PREF_PREFIX + key, defaultValue));
+  }
+
+  private static SharedPreferences getSharedPrefs(Context appContext) {
+    return DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(appContext);
+  }
+
+  private interface Provider<T> {
+    T get();
+  }
+
+  // Reading shared prefs on the main thread is generally safe since a single instance is cached.
+  private static <T> T bypassStrictMode(Provider<T> provider) {
+    StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+    try {
+      return provider.get();
+    } finally {
+      StrictMode.setThreadPolicy(oldPolicy);
+    }
+  }
+}
diff --git a/java/com/android/dialer/configprovider/SharedPrefConfigProviderModule.java b/java/com/android/dialer/configprovider/SharedPrefConfigProviderModule.java
new file mode 100644
index 0000000..fe1c908
--- /dev/null
+++ b/java/com/android/dialer/configprovider/SharedPrefConfigProviderModule.java
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package com.android.dialer.configprovider;
+
+import dagger.Binds;
+import dagger.Module;
+import javax.inject.Singleton;
+
+/** Dagger module providing {@link ConfigProvider} based on shared preferences. */
+@Module
+public abstract class SharedPrefConfigProviderModule {
+
+  @Binds
+  @Singleton
+  abstract ConfigProvider to(SharedPrefConfigProvider impl);
+}
diff --git a/java/com/android/dialer/contactsfragment/AddContactViewHolder.java b/java/com/android/dialer/contactsfragment/AddContactViewHolder.java
new file mode 100644
index 0000000..09c222e
--- /dev/null
+++ b/java/com/android/dialer/contactsfragment/AddContactViewHolder.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+package com.android.dialer.contactsfragment;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.view.View;
+import android.view.View.OnClickListener;
+import com.android.dialer.util.DialerUtils;
+import com.android.dialer.util.IntentUtil;
+
+/** ViewHolder for {@link ContactsFragment} to display add contact row. */
+final class AddContactViewHolder extends ViewHolder implements OnClickListener {
+
+  private final Context context;
+
+  AddContactViewHolder(View view) {
+    super(view);
+    view.setOnClickListener(this);
+    context = view.getContext();
+  }
+
+  @Override
+  public void onClick(View v) {
+    DialerUtils.startActivityWithErrorToast(
+        context, IntentUtil.getNewContactIntent(), R.string.add_contact_not_available);
+  }
+}
diff --git a/java/com/android/dialer/contactsfragment/ContactsAdapter.java b/java/com/android/dialer/contactsfragment/ContactsAdapter.java
index 309e034..d8ee3d1 100644
--- a/java/com/android/dialer/contactsfragment/ContactsAdapter.java
+++ b/java/com/android/dialer/contactsfragment/ContactsAdapter.java
@@ -20,6 +20,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract.Contacts;
+import android.support.annotation.IntDef;
 import android.support.v4.util.ArrayMap;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -27,9 +28,21 @@
 import android.view.ViewGroup;
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.lettertiles.LetterTileDrawable;
+import com.android.dialer.common.Assert;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /** List adapter for the union of all contacts associated with every account on the device. */
-final class ContactsAdapter extends RecyclerView.Adapter<ContactViewHolder> {
+final class ContactsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+  private static final int UNKNOWN_VIEW_TYPE = 0;
+  private static final int ADD_CONTACT_VIEW_TYPE = 1;
+  private static final int CONTACT_VIEW_TYPE = 2;
+
+  /** An Enum for the different row view types shown by this adapter. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({UNKNOWN_VIEW_TYPE, ADD_CONTACT_VIEW_TYPE, CONTACT_VIEW_TYPE})
+  @interface ContactsViewType {}
 
   private final ArrayMap<ContactViewHolder, Integer> holderMap = new ArrayMap<>();
   private final Context context;
@@ -41,7 +54,7 @@
   // Number of contacts that correspond to each header in {@code headers}.
   private final int[] counts;
 
-  public ContactsAdapter(Context context, Cursor cursor) {
+  ContactsAdapter(Context context, Cursor cursor) {
     this.context = context;
     this.cursor = cursor;
     headers = cursor.getExtras().getStringArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES);
@@ -49,15 +62,31 @@
   }
 
   @Override
-  public ContactViewHolder onCreateViewHolder(ViewGroup parent, int position) {
-    return new ContactViewHolder(
-        LayoutInflater.from(context).inflate(R.layout.contact_row, parent, false));
+  public RecyclerView.ViewHolder onCreateViewHolder(
+      ViewGroup parent, @ContactsViewType int viewType) {
+    switch (viewType) {
+      case ADD_CONTACT_VIEW_TYPE:
+        return new AddContactViewHolder(
+            LayoutInflater.from(context).inflate(R.layout.add_contact_row, parent, false));
+      case CONTACT_VIEW_TYPE:
+        return new ContactViewHolder(
+            LayoutInflater.from(context).inflate(R.layout.contact_row, parent, false));
+      case UNKNOWN_VIEW_TYPE:
+      default:
+        throw Assert.createIllegalStateFailException("Invalid view type: " + viewType);
+    }
   }
 
   @Override
-  public void onBindViewHolder(ContactViewHolder contactViewHolder, int position) {
+  public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) {
+    if (viewHolder instanceof AddContactViewHolder) {
+      return;
+    }
+
+    ContactViewHolder contactViewHolder = (ContactViewHolder) viewHolder;
     holderMap.put(contactViewHolder, position);
-    cursor.moveToPosition(position);
+    // Cursor should be offset by 1 because of add contact row
+    cursor.moveToPosition(position - 1);
 
     String name = getDisplayName(cursor);
     String header = getHeaderString(position);
@@ -84,9 +113,16 @@
   }
 
   @Override
-  public void onViewRecycled(ContactViewHolder contactViewHolder) {
+  public @ContactsViewType int getItemViewType(int position) {
+    return position == 0 ? ADD_CONTACT_VIEW_TYPE : CONTACT_VIEW_TYPE;
+  }
+
+  @Override
+  public void onViewRecycled(RecyclerView.ViewHolder contactViewHolder) {
     super.onViewRecycled(contactViewHolder);
-    holderMap.remove(contactViewHolder);
+    if (contactViewHolder instanceof ContactViewHolder) {
+      holderMap.remove(contactViewHolder);
+    }
   }
 
   public void refreshHeaders() {
@@ -101,7 +137,7 @@
 
   @Override
   public int getItemCount() {
-    return cursor == null ? 0 : cursor.getCount();
+    return (cursor == null ? 0 : cursor.getCount()) + 1; // add contact
   }
 
   private static String getDisplayName(Cursor cursor) {
@@ -124,6 +160,11 @@
   }
 
   public String getHeaderString(int position) {
+    if (position == 0) {
+      return "+";
+    }
+    position--;
+
     int index = -1;
     int sum = 0;
     while (sum <= position) {
diff --git a/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java b/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java
index 2bb540a..a22f7eb 100644
--- a/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java
+++ b/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java
@@ -55,7 +55,7 @@
             .appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true")
             .build(),
         contactProjection,
-        null,
+        contactProjection[CONTACT_DISPLAY_NAME] + " IS NOT NULL",
         null,
         sortKey + " ASC");
   }
diff --git a/java/com/android/dialer/contactsfragment/ContactsFragment.java b/java/com/android/dialer/contactsfragment/ContactsFragment.java
index a996a4f..e627718 100644
--- a/java/com/android/dialer/contactsfragment/ContactsFragment.java
+++ b/java/com/android/dialer/contactsfragment/ContactsFragment.java
@@ -16,7 +16,6 @@
 
 package com.android.dialer.contactsfragment;
 
-import android.Manifest.permission;
 import android.app.Fragment;
 import android.app.LoaderManager.LoaderCallbacks;
 import android.content.Loader;
@@ -36,18 +35,23 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.common.preference.ContactsPreferences.ChangeListener;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.widget.EmptyContentView;
 import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.util.Arrays;
 
 /** Fragment containing a list of all contacts. */
 public class ContactsFragment extends Fragment
     implements LoaderCallbacks<Cursor>,
         OnScrollChangeListener,
-        OnEmptyViewActionButtonClickedListener {
+        OnEmptyViewActionButtonClickedListener,
+        ChangeListener {
 
   public static final int READ_CONTACTS_PERMISSION_REQUEST_CODE = 1;
 
@@ -60,14 +64,11 @@
 
   private ContactsPreferences contactsPrefs;
 
-  private final ContactsPreferences.ChangeListener preferencesChangeListener =
-      () -> getLoaderManager().restartLoader(0, null, this);
-
   @Override
-  public void onCreate(Bundle savedState) {
-    super.onCreate(savedState);
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
     contactsPrefs = new ContactsPreferences(getContext());
-    contactsPrefs.registerChangeListener(preferencesChangeListener);
+    contactsPrefs.registerChangeListener(this);
   }
 
   @Nullable
@@ -75,11 +76,11 @@
   public View onCreateView(
       LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.fragment_contacts, container, false);
-    fastScroller = (FastScroller) view.findViewById(R.id.fast_scroller);
-    anchoredHeader = (TextView) view.findViewById(R.id.header);
-    recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
+    fastScroller = view.findViewById(R.id.fast_scroller);
+    anchoredHeader = view.findViewById(R.id.header);
+    recyclerView = view.findViewById(R.id.recycler_view);
 
-    emptyContentView = (EmptyContentView) view.findViewById(R.id.empty_list_view);
+    emptyContentView = view.findViewById(R.id.empty_list_view);
     emptyContentView.setImage(R.drawable.empty_contacts);
     emptyContentView.setActionClickedListener(this);
 
@@ -94,6 +95,13 @@
     return view;
   }
 
+  @Override
+  public void onChange() {
+    if (getActivity() != null && isAdded()) {
+      getLoaderManager().restartLoader(0, null, this);
+    }
+  }
+
   /** @return a loader according to sort order and display order. */
   @Override
   public Loader<Cursor> onCreateLoader(int id, Bundle args) {
@@ -134,6 +142,7 @@
 
       recyclerView.setLayoutManager(manager);
       recyclerView.setAdapter(adapter);
+      PerformanceReport.logOnScrollStateChange(recyclerView);
       fastScroller.setup(adapter, manager);
     }
   }
@@ -169,15 +178,17 @@
     if (firstVisibleItem == firstCompletelyVisible && firstVisibleItem == 0) {
       adapter.refreshHeaders();
       anchoredHeader.setVisibility(View.INVISIBLE);
-    } else if (adapter.getHeaderString(firstVisibleItem).equals(anchoredHeaderString)) {
-      anchoredHeader.setText(anchoredHeaderString);
-      anchoredHeader.setVisibility(View.VISIBLE);
-      getContactHolder(firstVisibleItem).getHeaderView().setVisibility(View.INVISIBLE);
-      getContactHolder(firstCompletelyVisible).getHeaderView().setVisibility(View.INVISIBLE);
-    } else {
-      anchoredHeader.setVisibility(View.INVISIBLE);
-      getContactHolder(firstVisibleItem).getHeaderView().setVisibility(View.VISIBLE);
-      getContactHolder(firstCompletelyVisible).getHeaderView().setVisibility(View.VISIBLE);
+    } else if (firstVisibleItem != 0) { // skip the add contact row
+      if (adapter.getHeaderString(firstVisibleItem).equals(anchoredHeaderString)) {
+        anchoredHeader.setText(anchoredHeaderString);
+        anchoredHeader.setVisibility(View.VISIBLE);
+        getContactHolder(firstVisibleItem).getHeaderView().setVisibility(View.INVISIBLE);
+        getContactHolder(firstCompletelyVisible).getHeaderView().setVisibility(View.INVISIBLE);
+      } else {
+        anchoredHeader.setVisibility(View.INVISIBLE);
+        getContactHolder(firstVisibleItem).getHeaderView().setVisibility(View.VISIBLE);
+        getContactHolder(firstCompletelyVisible).getHeaderView().setVisibility(View.VISIBLE);
+      }
     }
   }
 
@@ -188,8 +199,17 @@
   @Override
   public void onEmptyViewActionButtonClicked() {
     if (emptyContentView.getActionLabel() == R.string.permission_single_turn_on) {
-      FragmentCompat.requestPermissions(
-          this, new String[] {permission.READ_CONTACTS}, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+      String[] deniedPermissions =
+          PermissionsUtil.getPermissionsCurrentlyDenied(
+              getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+      if (deniedPermissions.length > 0) {
+        LogUtil.i(
+            "ContactsFragment.onEmptyViewActionButtonClicked",
+            "Requesting permissions: " + Arrays.toString(deniedPermissions));
+        FragmentCompat.requestPermissions(
+            this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+      }
+
     } else if (emptyContentView.getActionLabel()
         == R.string.all_contacts_empty_add_contact_action) {
       // Add new contact
diff --git a/java/com/android/dialer/contactsfragment/FastScroller.java b/java/com/android/dialer/contactsfragment/FastScroller.java
index 980032c..0223c5f 100644
--- a/java/com/android/dialer/contactsfragment/FastScroller.java
+++ b/java/com/android/dialer/contactsfragment/FastScroller.java
@@ -48,13 +48,14 @@
   @Override
   protected void onFinishInflate() {
     super.onFinishInflate();
-    container = (TextView) findViewById(R.id.fast_scroller_container);
+    container = findViewById(R.id.fast_scroller_container);
     scrollBar = findViewById(R.id.fast_scroller_scroll_bar);
   }
 
   void setup(ContactsAdapter adapter, LinearLayoutManager layoutManager) {
     this.adapter = adapter;
     this.layoutManager = layoutManager;
+    setVisibility(VISIBLE);
   }
 
   @Override
diff --git a/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml b/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml
new file mode 100644
index 0000000..dbc7caf
--- /dev/null
+++ b/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml
@@ -0,0 +1,50 @@
+<?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
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/click_target"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/row_height"
+    android:layout_marginTop="8dp"
+    android:layout_marginStart="@dimen/header_width"
+    android:layout_marginEnd="@dimen/row_end_margin"
+    android:paddingTop="@dimen/row_top_bottom_padding"
+    android:paddingBottom="@dimen/row_top_bottom_padding"
+    android:paddingStart="@dimen/row_start_padding"
+    android:gravity="center_vertical"
+    android:background="?android:attr/selectableItemBackground">
+
+  <ImageView
+      android:id="@+id/photo"
+      android:layout_width="@dimen/photo_size"
+      android:layout_height="@dimen/photo_size"
+      android:src="@drawable/quantum_ic_person_add_white_24"
+      android:tint="@color/dialer_theme_color"
+      android:scaleType="center"/>
+
+  <TextView
+      android:id="@+id/contact_name"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:paddingStart="@dimen/text_padding_start"
+      android:paddingEnd="@dimen/text_padding_end"
+      android:gravity="center_vertical"
+      android:fontFamily="sans-serif"
+      android:text="@string/all_contacts_empty_add_contact_action"
+      style="@style/PrimaryText"/>
+</LinearLayout>
diff --git a/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml b/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
index 7cbc4f0..3d58aad 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
@@ -33,7 +33,8 @@
       android:layout_height="match_parent"
       android:layout_marginTop="8dp"
       android:layout_marginBottom="8dp"
-      android:clipChildren="false">
+      android:clipChildren="false"
+      android:visibility="gone">
 
     <TextView
         android:id="@+id/fast_scroller_container"
diff --git a/java/com/android/dialer/dialercontact/dialer_contact.proto b/java/com/android/dialer/dialercontact/dialer_contact.proto
index ee364c6..9b7724f 100644
--- a/java/com/android/dialer/dialercontact/dialer_contact.proto
+++ b/java/com/android/dialer/dialercontact/dialer_contact.proto
@@ -15,4 +15,12 @@
   optional string display_number = 7;
   optional string number_label = 8;
   optional int32 contact_type = 9;
+  optional SimDetails sim_details = 10;
+}
+
+message SimDetails {
+  // Human readable netwrork name displayed to user where relevant
+  optional string network = 1;
+  // This value represents a hex representation of a color (i.e. #ffffff)
+  optional int32 color = 2;
 }
diff --git a/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java b/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java
index 250c643..27dc0e9 100644
--- a/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java
+++ b/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java
@@ -16,20 +16,41 @@
 package com.android.dialer.enrichedcall;
 
 import android.support.annotation.NonNull;
-import com.android.dialer.common.Assert;
 
 /** Utility for comparing phone numbers. */
 public class FuzzyPhoneNumberMatcher {
 
-  /** Returns {@code true} if the given numbers can be interpreted to be the same. */
-  public static boolean matches(@NonNull String a, @NonNull String b) {
-    String aNormalized = Assert.isNotNull(a).replaceAll("[^0-9]", "");
-    String bNormalized = Assert.isNotNull(b).replaceAll("[^0-9]", "");
-    if (aNormalized.length() < 7 || bNormalized.length() < 7) {
-      return false;
+  private static final int REQUIRED_MATCHED_DIGITS = 7;
+
+  /**
+   * Returns {@code true} if the given numbers can be interpreted to be the same.
+   *
+   * <p>This method is called numerous times when rendering the call log. Using string methods is
+   * too slow, so character by character matching is used instead.
+   */
+  public static boolean matches(@NonNull String lhs, @NonNull String rhs) {
+    int aIndex = lhs.length() - 1;
+    int bIndex = rhs.length() - 1;
+
+    int matchedDigits = 0;
+
+    while (aIndex >= 0 && bIndex >= 0) {
+      if (!Character.isDigit(lhs.charAt(aIndex))) {
+        --aIndex;
+        continue;
+      }
+      if (!Character.isDigit(rhs.charAt(bIndex))) {
+        --bIndex;
+        continue;
+      }
+      if (lhs.charAt(aIndex) != rhs.charAt(bIndex)) {
+        return false;
+      }
+      --aIndex;
+      --bIndex;
+      ++matchedDigits;
     }
-    String aMatchable = aNormalized.substring(aNormalized.length() - 7);
-    String bMatchable = bNormalized.substring(bNormalized.length() - 7);
-    return aMatchable.equals(bMatchable);
+
+    return matchedDigits >= REQUIRED_MATCHED_DIGITS;
   }
 }
diff --git a/java/com/android/dialer/app/bindings/DialerBindings.java b/java/com/android/dialer/inject/ApplicationContext.java
similarity index 65%
rename from java/com/android/dialer/app/bindings/DialerBindings.java
rename to java/com/android/dialer/inject/ApplicationContext.java
index e1f5178..913e36e 100644
--- a/java/com/android/dialer/app/bindings/DialerBindings.java
+++ b/java/com/android/dialer/inject/ApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -13,13 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
+package com.android.dialer.inject;
 
-package com.android.dialer.app.bindings;
+import javax.inject.Qualifier;
 
-import com.android.dialer.common.ConfigProvider;
-
-/** This interface allows the container application to customize the dialer. */
-public interface DialerBindings {
-
-  ConfigProvider getConfigProvider();
-}
+/** Annotation for retrieving the application context. */
+@Qualifier
+public @interface ApplicationContext {}
diff --git a/java/com/android/dialer/inject/ContextModule.java b/java/com/android/dialer/inject/ContextModule.java
index aa83f01..e3da08e 100644
--- a/java/com/android/dialer/inject/ContextModule.java
+++ b/java/com/android/dialer/inject/ContextModule.java
@@ -22,17 +22,18 @@
 import dagger.Module;
 import dagger.Provides;
 
-/** Provides the singleton context object. */
+/** Provides the singleton application context object. */
 @Module
 public final class ContextModule {
 
   @NonNull private final Context context;
 
-  public ContextModule(@NonNull Context context) {
-    this.context = Assert.isNotNull(context);
+  public ContextModule(@NonNull Context appContext) {
+    this.context = Assert.isNotNull(appContext);
   }
 
   @Provides
+  @ApplicationContext
   Context provideContext() {
     return context;
   }
diff --git a/java/com/android/dialer/lightbringer/Lightbringer.java b/java/com/android/dialer/lightbringer/Lightbringer.java
index 8caafda..510f8a9 100644
--- a/java/com/android/dialer/lightbringer/Lightbringer.java
+++ b/java/com/android/dialer/lightbringer/Lightbringer.java
@@ -22,16 +22,24 @@
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.telecom.Call;
+import android.telecom.PhoneAccountHandle;
 
 public interface Lightbringer {
 
   @MainThread
-  boolean isReachable(@NonNull Context context, @NonNull String number);
+  boolean isReachable(@NonNull Context context, @Nullable String number);
+
+  @MainThread
+  boolean supportsUpgrade(@NonNull Context context, @Nullable String number);
 
   @MainThread
   Intent getIntent(@NonNull Context context, @NonNull String number);
 
   @MainThread
+  void requestUpgrade(Call call);
+
+  @MainThread
   void registerListener(@NonNull LightbringerListener listener);
 
   @MainThread
@@ -39,9 +47,13 @@
 
   @Nullable
   @MainThread
-  ComponentName getPhoneAccountComponentName(@NonNull Context context);
+  ComponentName getPhoneAccountComponentName();
+
+  @Nullable
+  @MainThread
+  PhoneAccountHandle getPhoneAccountHandle();
 
   @NonNull
   @MainThread
-  String getPackageName(@NonNull Context context);
+  String getPackageName();
 }
diff --git a/java/com/android/dialer/lightbringer/stub/LightbringerStub.java b/java/com/android/dialer/lightbringer/stub/LightbringerStub.java
index f9bb4cd..c835fea 100644
--- a/java/com/android/dialer/lightbringer/stub/LightbringerStub.java
+++ b/java/com/android/dialer/lightbringer/stub/LightbringerStub.java
@@ -19,7 +19,11 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.telecom.Call;
+import android.telecom.PhoneAccountHandle;
 import com.android.dialer.common.Assert;
 import com.android.dialer.lightbringer.Lightbringer;
 import com.android.dialer.lightbringer.LightbringerListener;
@@ -30,30 +34,67 @@
   @Inject
   public LightbringerStub() {}
 
+  @MainThread
   @Override
-  public boolean isReachable(Context context, String number) {
+  public boolean isReachable(@NonNull Context context, @Nullable String number) {
+    Assert.isMainThread();
+    Assert.isNotNull(context);
     return false;
   }
 
+  @MainThread
   @Override
-  public Intent getIntent(Context context, String number) {
+  public boolean supportsUpgrade(@NonNull Context context, @Nullable String number) {
+    Assert.isMainThread();
+    Assert.isNotNull(context);
+    return false;
+  }
+
+  @MainThread
+  @Override
+  public Intent getIntent(@NonNull Context context, @NonNull String number) {
+    Assert.isMainThread();
+    Assert.isNotNull(context);
+    Assert.isNotNull(number);
     return null;
   }
 
+  @MainThread
   @Override
-  public void registerListener(LightbringerListener listener) {}
+  public void requestUpgrade(Call call) {
+    Assert.isMainThread();
+    Assert.isNotNull(call);
+  }
 
+  @MainThread
   @Override
-  public void unregisterListener(LightbringerListener listener) {}
+  public void registerListener(LightbringerListener listener) {
+    Assert.isMainThread();
+    Assert.isNotNull(listener);
+  }
 
+  @MainThread
   @Override
-  public ComponentName getPhoneAccountComponentName(Context context) {
+  public void unregisterListener(LightbringerListener listener) {
+    Assert.isMainThread();
+    Assert.isNotNull(listener);
+  }
+
+  @Nullable
+  @Override
+  public ComponentName getPhoneAccountComponentName() {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public PhoneAccountHandle getPhoneAccountHandle() {
     return null;
   }
 
   @NonNull
   @Override
-  public String getPackageName(@NonNull Context context) {
-    throw Assert.createUnsupportedOperationFailException();
+  public String getPackageName() {
+    return "";
   }
 }
diff --git a/java/com/android/dialer/logging/LoggingBindings.java b/java/com/android/dialer/logging/LoggingBindings.java
index 4a98d9e..85ccfdf 100644
--- a/java/com/android/dialer/logging/LoggingBindings.java
+++ b/java/com/android/dialer/logging/LoggingBindings.java
@@ -70,7 +70,7 @@
       int multipleNumbersContactsCount,
       int contactsWithPhotoCount,
       int contactsWithNameCount,
-      int duoReachableContactCount);
+      int lightbringerReachableContactsCount);
 
   /** Logs a hit event to the analytics server. */
   void sendHitEventAnalytics(String category, String action, String label, long value);
diff --git a/java/com/android/dialer/logging/LoggingBindingsStub.java b/java/com/android/dialer/logging/LoggingBindingsStub.java
index dd3b8ac..3892996 100644
--- a/java/com/android/dialer/logging/LoggingBindingsStub.java
+++ b/java/com/android/dialer/logging/LoggingBindingsStub.java
@@ -44,7 +44,7 @@
       int multipleNumbersContactsCount,
       int contactsWithPhotoCount,
       int contactsWithNameCount,
-      int duoReachableContactsCount) {}
+      int lightbringerReachableContactsCount) {}
 
   @Override
   public void sendHitEventAnalytics(String category, String action, String label, long value) {}
diff --git a/java/com/android/dialer/logging/contact_lookup_result.proto b/java/com/android/dialer/logging/contact_lookup_result.proto
index c9624af..13ea3c8 100644
--- a/java/com/android/dialer/logging/contact_lookup_result.proto
+++ b/java/com/android/dialer/logging/contact_lookup_result.proto
@@ -17,10 +17,10 @@
     // Contact was found in the local database.
     LOCAL_CONTACT = 2;
 
-    // Contact was found in Google Dialer's internal phone number cache
+    // DEPRECATED: see subcategories below
     LOCAL_CACHE = 3;
 
-    // Contact was found via Google Caller ID
+    // DEPRECATED: see subcategories below
     REMOTE = 4;
 
     // Phone number was an emergency phone number
@@ -28,5 +28,40 @@
 
     // Phone number was the SIM card's voicemail number
     VOICEMAIL = 6;
+
+    // Phone number was identified via the places part of the People API.
+    REMOTE_PLACES = 7;
+
+    // Phone number was identified via the profile part of the People API.
+    REMOTE_PROFILE = 8;
+
+    // Number was found in Dialer's local cache but we don't know how it was
+    // originally identified.
+    LOCAL_CACHE_UNKNOWN = 9;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // as a personal contact.
+    LOCAL_CACHE_DIRECTORY = 10;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // via a custom extended directory.
+    LOCAL_CACHE_EXTENDED = 11;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // via the places part of the People API.
+    LOCAL_CACHE_PLACES = 12;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // via the profile part of the People API.
+    LOCAL_CACHE_PROFILE = 13;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // via Caller Name Presentation (CNAP) information. Calls in this
+    // category would have had ContactLookupResultType NOT_FOUND originally.
+    LOCAL_CACHE_CNAP = 14;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // via Cequint caller ID.
+    LOCAL_CACHE_CEQUINT = 15;
   }
 }
diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto
index 1d8c828..ba8d922 100644
--- a/java/com/android/dialer/logging/dialer_impression.proto
+++ b/java/com/android/dialer/logging/dialer_impression.proto
@@ -10,7 +10,7 @@
   // Event enums to be used for Impression Logging in Dialer.
   // It's perfectly acceptable for this enum to be large
   // Values should be from 1000 to 100000.
-  // Next Tag:1196
+  // Next Tag:1227
   enum Type {
 
     UNKNOWN_AOSP_EVENT_TYPE = 1000;
@@ -403,5 +403,40 @@
     LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG = 1197;
     IMS_VIDEO_REQUESTED_FROM_SEARCH = 1198;
     IMS_VIDEO_REQUESTED_FROM_CALL_LOG = 1199;
+
+    // Multi select impressions
+    MULTISELECT_LONG_PRESS_ENTER_MULTI_SELECT_MODE = 1200;
+    MULTISELECT_LONG_PRESS_TAP_ENTRY = 1201;
+    MULTISELECT_SINGLE_PRESS_SELECT_ENTRY = 1202;
+    MULTISELECT_SINGLE_PRESS_UNSELECT_ENTRY = 1203;
+    MULTISELECT_SINGLE_PRESS_TAP_VIA_CONTACT_BADGE = 1204;
+    MULTISELECT_SELECT_ALL = 1205;
+    MULTISELECT_UNSELECT_ALL = 1206;
+    MULTISELECT_TAP_DELETE_ICON = 1207;
+    MULTISELECT_DISPLAY_DELETE_CONFIRMATION_DIALOG = 1208;
+    MULTISELECT_DELETE_ENTRY_VIA_CONFIRMATION_DIALOG = 1209;
+    MULTISELECT_CANCEL_CONFIRMATION_DIALOG_VIA_CANCEL_BUTTON = 1210;
+    MULTISELECT_CANCEL_CONFIRMATION_DIALOG_VIA_CANCEL_TOUCH = 1211;
+    MULTISELECT_ROTATE_AND_SHOW_ACTION_MODE= 1212;
+
+    // Impressions for verizon VVM with backup and transcription ToS
+    VOICEMAIL_VVM3_TOS_V2_CREATED = 1213;
+    VOICEMAIL_VVM3_TOS_V2_ACCEPTED = 1214;
+    VOICEMAIL_VVM3_TOS_V2_DECLINE_CLICKED = 1215;
+    // Impressions for dialer voicemail with backup and transcription ToS
+    VOICEMAIL_DIALER_TOS_CREATED = 1216;
+    VOICEMAIL_DIALER_TOS_ACCEPTED = 1217;
+    VOICEMAIL_DIALER_TOS_DECLINE_CLICKED = 1218;
+
+    // Add or create contact
+    // Creating new contact fab was logged as NEW_CONTACT_FAB
+    CREATE_NEW_CONTACT_FROM_CALL_LOG = 1219;
+    CREATE_NEW_CONTACT_FROM_DIALPAD = 1220;
+    CREATE_NEW_CONTACT_FROM_VOICEMAIL = 1221;
+    CREATE_NEW_CONTACT_FROM_CALL_HISTORY = 1222;
+    ADD_TO_A_CONTACT_FROM_CALL_LOG = 1223;
+    ADD_TO_A_CONTACT_FROM_DIALPAD = 1224;
+    ADD_TO_A_CONTACT_FROM_VOICEMAIL = 1225;
+    ADD_TO_A_CONTACT_FROM_CALL_HISTORY = 1226;
   }
 }
diff --git a/java/com/android/dialer/logging/ui_action.proto b/java/com/android/dialer/logging/ui_action.proto
new file mode 100644
index 0000000..784dbed
--- /dev/null
+++ b/java/com/android/dialer/logging/ui_action.proto
@@ -0,0 +1,43 @@
+syntax = "proto2";
+
+package com.android.dialer.logging;
+option java_package = "com.android.dialer.logging";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+message UiAction {
+  enum Type {
+    UNKNOWN = 0;
+
+    // General action starting from 1
+    CHANGE_TAB_TO_FAVORITE = 1;
+    CHANGE_TAB_TO_CALL_LOG = 2;
+    CHANGE_TAB_TO_CONTACTS = 3;
+    CHANGE_TAB_TO_VOICEMAIL = 4;
+    PRESS_ANDROID_BACK_BUTTON = 5;
+    TEXT_CHANGE_WITH_INPUT = 6;
+    SCROLL = 7;
+
+    // In call log, starting from 100
+    CLICK_CALL_LOG_ITEM = 100;
+    OPEN_CALL_DETAIL = 101;
+    CLOSE_CALL_DETAIL_WITH_CANCEL_BUTTON = 102;
+    COPY_NUMBER_IN_CALL_DETAIL = 103;
+    EDIT_NUMBER_BEFORE_CALL_IN_CALL_DETAIL = 104;
+
+    // In dialpad, starting from 200
+    OPEN_DIALPAD = 200;
+    CLOSE_DIALPAD = 201;
+    PRESS_CALL_BUTTON_WITHOUT_CALLING = 202;
+
+    // In search, starting from 300
+    OPEN_SEARCH = 300;
+    HIDE_KEYBOARD_IN_SEARCH = 301;
+    CLOSE_SEARCH_WITH_HIDE_BUTTON = 302;
+
+    // In call history, starting from 400
+    OPEN_CALL_HISTORY = 400;
+    CLOSE_CALL_HISTORY_WITH_CANCEL_BUTTON = 401;
+  }
+}
diff --git a/java/com/android/dialer/main/Main.java b/java/com/android/dialer/main/Main.java
new file mode 100644
index 0000000..14ac7e4
--- /dev/null
+++ b/java/com/android/dialer/main/Main.java
@@ -0,0 +1,27 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.main;
+
+import android.content.Context;
+
+/** Used to display the main activity for Dialer. This hosts favorites, dial pad, search, etc... */
+public interface Main {
+  boolean isNewUiEnabled(Context context);
+
+  // TODO(38502365): Remove this when we're ready to launch the new UI. */
+  void createNewUiLauncherShortcut(Context context);
+}
diff --git a/java/com/android/dialer/main/MainComponent.java b/java/com/android/dialer/main/MainComponent.java
new file mode 100644
index 0000000..e735457
--- /dev/null
+++ b/java/com/android/dialer/main/MainComponent.java
@@ -0,0 +1,39 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.main;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.main.impl.MainModule;
+import dagger.Subcomponent;
+
+/** Subcomponent that can be used to access the main implementation. */
+@Subcomponent(modules = MainModule.class)
+public abstract class MainComponent {
+
+  public abstract Main getMain();
+
+  public static MainComponent get(Context context) {
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .mainComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    MainComponent mainComponent();
+  }
+}
diff --git a/java/com/android/dialer/main/impl/AndroidManifest.xml b/java/com/android/dialer/main/impl/AndroidManifest.xml
new file mode 100644
index 0000000..8edde50
--- /dev/null
+++ b/java/com/android/dialer/main/impl/AndroidManifest.xml
@@ -0,0 +1,110 @@
+<?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
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.android.dialer.main.impl">
+
+  <application>
+
+    <activity
+      android:clearTaskOnLaunch="true"
+      android:directBootAware="true"
+      android:enabled="false"
+      android:exported="true"
+      android:icon="@drawable/nui_launcher_icon"
+      android:label="@string/main_activity_label"
+      android:launchMode="singleTask"
+      android:name="com.android.dialer.main.impl.MainActivity"
+      android:resizeableActivity="true"
+      android:theme="@style/NuiMainActivityTheme"
+      android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
+
+      <!-- LINT.IfChange -->
+      <intent-filter>
+        <action android:name="android.intent.action.DIAL"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:mimeType="vnd.android.cursor.item/phone"/>
+        <data android:mimeType="vnd.android.cursor.item/person"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.DIAL"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:scheme="voicemail"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.DIAL"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <action android:name="android.intent.action.DIAL"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:scheme="tel"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:mimeType="vnd.android.cursor.dir/calls"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.CALL_BUTTON"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+      </intent-filter>
+      <!-- This was never intended to be public, but is here for backward
+           compatibility.  Use Intent.ACTION_DIAL instead. -->
+      <intent-filter>
+        <action android:name="com.android.phone.action.TOUCH_DIALER"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.TAB"/>
+      </intent-filter>
+      <intent-filter android:label="@string/main_call_history_tab_description">
+        <action android:name="com.android.phone.action.RECENT_CALLS"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.TAB"/>
+      </intent-filter>
+      <!-- LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml) -->
+
+      <meta-data
+        android:name="com.android.keyguard.layout"
+        android:resource="@layout/keyguard_preview"/>
+    </activity>
+
+  </application>
+
+</manifest>
diff --git a/java/com/android/dialer/main/impl/MainActivity.java b/java/com/android/dialer/main/impl/MainActivity.java
new file mode 100644
index 0000000..4b2bd2e
--- /dev/null
+++ b/java/com/android/dialer/main/impl/MainActivity.java
@@ -0,0 +1,91 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.main.impl;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+import com.android.dialer.common.LogUtil;
+
+/** This is the main activity for dialer. It hosts favorites, call log, search, dialpad, etc... */
+public final class MainActivity extends AppCompatActivity implements View.OnClickListener {
+
+  static Intent getIntent(Context context) {
+    return new Intent(context, MainActivity.class)
+        .setAction(Intent.ACTION_VIEW)
+        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    LogUtil.enterBlock("MainActivity.onCreate");
+    setContentView(R.layout.main_activity);
+    initLayout();
+  }
+
+  private void initLayout() {
+    findViewById(R.id.fab).setOnClickListener(this);
+
+    ViewPager pager = findViewById(R.id.pager);
+    MainPagerAdapter pagerAdapter = new MainPagerAdapter(this, getSupportFragmentManager());
+    pager.setAdapter(pagerAdapter);
+
+    TabLayout tabLayout = findViewById(R.id.tab_layout);
+    tabLayout.setupWithViewPager(pager);
+
+    Toolbar toolbar = findViewById(R.id.toolbar);
+    toolbar.setPopupTheme(android.R.style.Theme_Material_Light);
+    setSupportActionBar(toolbar);
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    getMenuInflater().inflate(R.menu.main_menu, menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    Toast.makeText(this, "Not yet implemented", Toast.LENGTH_SHORT).show();
+    if (item.getItemId() == R.id.search) {
+      // open search
+      return true;
+    } else if (item.getItemId() == R.id.contacts) {
+      // open contacts
+      return true;
+    } else {
+      // TODO handle other menu items
+      return super.onOptionsItemSelected(item);
+    }
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (v.getId() == R.id.fab) {
+      // open dialpad search
+    }
+  }
+}
diff --git a/java/com/android/dialer/main/impl/MainImpl.java b/java/com/android/dialer/main/impl/MainImpl.java
new file mode 100644
index 0000000..d29e8c0
--- /dev/null
+++ b/java/com/android/dialer/main/impl/MainImpl.java
@@ -0,0 +1,90 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.main.impl;
+
+import android.annotation.TargetApi;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build.VERSION_CODES;
+import android.support.v4.content.pm.ShortcutInfoCompat;
+import android.support.v4.content.pm.ShortcutManagerCompat;
+import android.support.v4.graphics.drawable.IconCompat;
+import android.support.v4.os.BuildCompat;
+import com.android.dialer.buildtype.BuildType;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.main.Main;
+import javax.inject.Inject;
+
+/** The entry point for the main feature. */
+final class MainImpl implements Main {
+  private static final String SHORTCUT_KEY = "nui_launcher_shortcut";
+
+  @Inject
+  public MainImpl() {}
+
+  @Override
+  public boolean isNewUiEnabled(Context context) {
+    return BuildType.get() == BuildType.BUGFOOD || LogUtil.isDebugEnabled();
+  }
+
+  @Override
+  public void createNewUiLauncherShortcut(Context context) {
+    enableComponent(context);
+    if (BuildCompat.isAtLeastO()) {
+      createLauncherShortcutO(context);
+    } else {
+      createLauncherShortcutPreO(context);
+    }
+  }
+
+  /**
+   * Enables the NUI activity component. By default the component is disabled and can't be accessed.
+   * Once the component has been enabled the user will get an option to use the new UI to handle
+   * DIAL (and other) intents.
+   */
+  private static void enableComponent(Context context) {
+    context
+        .getPackageManager()
+        .setComponentEnabledSetting(
+            new ComponentName(context, MainActivity.class),
+            PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+            PackageManager.DONT_KILL_APP);
+  }
+
+  @TargetApi(VERSION_CODES.O)
+  private static void createLauncherShortcutO(Context context) {
+    ShortcutInfoCompat shortcutInfo =
+        new ShortcutInfoCompat.Builder(context, SHORTCUT_KEY)
+            .setIcon(IconCompat.createWithResource(context, R.drawable.nui_launcher_icon))
+            .setIntent(MainActivity.getIntent(context))
+            .setShortLabel(context.getString(R.string.nui_shortcut_name))
+            .build();
+    ShortcutManagerCompat.requestPinShortcut(context, shortcutInfo, null);
+  }
+
+  private static void createLauncherShortcutPreO(Context context) {
+    Intent intent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
+    intent.putExtra(
+        Intent.EXTRA_SHORTCUT_ICON,
+        Intent.ShortcutIconResource.fromContext(context, R.drawable.nui_launcher_icon));
+    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, context.getString(R.string.nui_shortcut_name));
+    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, MainActivity.getIntent(context));
+    context.sendBroadcast(intent);
+  }
+}
diff --git a/java/com/android/dialer/common/ConfigProvider.java b/java/com/android/dialer/main/impl/MainModule.java
similarity index 61%
copy from java/com/android/dialer/common/ConfigProvider.java
copy to java/com/android/dialer/main/impl/MainModule.java
index c0791e9..90342cf 100644
--- a/java/com/android/dialer/common/ConfigProvider.java
+++ b/java/com/android/dialer/main/impl/MainModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -14,14 +14,17 @@
  * limitations under the License
  */
 
-package com.android.dialer.common;
+package com.android.dialer.main.impl;
 
-/** Gets config values from the container application. */
-public interface ConfigProvider {
+import com.android.dialer.main.Main;
+import dagger.Module;
+import dagger.Provides;
 
-  String getString(String key, String defaultValue);
-
-  long getLong(String key, long defaultValue);
-
-  boolean getBoolean(String key, boolean defaultValue);
+/** This module provides an instance of {@link Main}. */
+@Module
+public final class MainModule {
+  @Provides
+  public static Main provideMain() {
+    return new MainImpl();
+  }
 }
diff --git a/java/com/android/dialer/main/impl/MainPagerAdapter.java b/java/com/android/dialer/main/impl/MainPagerAdapter.java
new file mode 100644
index 0000000..19cf4e7
--- /dev/null
+++ b/java/com/android/dialer/main/impl/MainPagerAdapter.java
@@ -0,0 +1,75 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.main.impl;
+
+import android.content.Context;
+import android.support.annotation.IntDef;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import com.android.dialer.common.Assert;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Adapter for {@link MainActivity} ViewPager. */
+final class MainPagerAdapter extends FragmentStatePagerAdapter {
+
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    TabIndex.SPEED_DIAL,
+    TabIndex.HISTORY,
+    TabIndex.VOICEMAIL,
+  })
+  private @interface TabIndex {
+    int SPEED_DIAL = 0;
+    int HISTORY = 1;
+    int VOICEMAIL = 2;
+  }
+
+  private final Context context;
+
+  MainPagerAdapter(Context context, FragmentManager fragmentManager) {
+    super(fragmentManager);
+    this.context = context;
+  }
+
+  @Override
+  public int getCount() {
+    // TODO: add logic to hide/show voicemail tab
+    return 3;
+  }
+
+  @Override
+  public Fragment getItem(int position) {
+    // TODO: implement tabs
+    return new StubFragment();
+  }
+
+  @Override
+  public CharSequence getPageTitle(int position) {
+    switch (position) {
+      case TabIndex.SPEED_DIAL:
+        return context.getString(R.string.tab_title_speed_dial);
+      case TabIndex.HISTORY:
+        return context.getString(R.string.tab_title_call_history);
+      case TabIndex.VOICEMAIL:
+        return context.getString(R.string.tab_title_voicemail);
+      default:
+        throw Assert.createIllegalStateFailException("Tab position with no title: " + position);
+    }
+  }
+}
diff --git a/java/com/android/dialer/main/impl/StubFragment.java b/java/com/android/dialer/main/impl/StubFragment.java
new file mode 100644
index 0000000..8e0accf
--- /dev/null
+++ b/java/com/android/dialer/main/impl/StubFragment.java
@@ -0,0 +1,35 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.main.impl;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/** Stub Fragment for Dialer. */
+public class StubFragment extends Fragment {
+
+  @Nullable
+  @Override
+  public View onCreateView(
+      LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.stub_fragment, container, false);
+  }
+}
diff --git a/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png b/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png
new file mode 100644
index 0000000..7845ebc
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png
Binary files differ
diff --git a/java/com/android/dialer/main/impl/res/layout/main_activity.xml b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
new file mode 100644
index 0000000..73b2eae
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
@@ -0,0 +1,68 @@
+<?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
+  -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:textColor="@android:color/secondary_text_dark_nodisable"/>
+
+  <android.support.design.widget.CoordinatorLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppBarTheme">
+
+      <android.support.v7.widget.Toolbar
+          android:id="@+id/toolbar"
+          android:layout_height="wrap_content"
+          android:layout_width="match_parent"
+          android:background="?android:attr/colorPrimary"/>
+
+      <android.support.design.widget.TabLayout
+          android:id="@+id/tab_layout"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:background="?android:attr/colorPrimary"
+          app:tabIndicatorColor="?android:attr/colorAccent"
+          app:layout_scrollFlags="enterAlwaysCollapsed"/>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:src="@drawable/quantum_ic_dialpad_white_24"
+        app:backgroundTint="?android:attr/colorAccent"/>
+  </android.support.design.widget.CoordinatorLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/res/layout/stub_fragment.xml b/java/com/android/dialer/main/impl/res/layout/stub_fragment.xml
new file mode 100644
index 0000000..3bb744f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/layout/stub_fragment.xml
@@ -0,0 +1,27 @@
+<?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
+  -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:text="hello world!"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/res/menu/main_menu.xml b/java/com/android/dialer/main/impl/res/menu/main_menu.xml
new file mode 100644
index 0000000..09bcbf8
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/menu/main_menu.xml
@@ -0,0 +1,47 @@
+<?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
+  -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+  <item
+      android:id="@+id/search"
+      android:icon="@drawable/quantum_ic_search_white_24"
+      android:title="@string/search"
+      android:contentDescription="@string/description_search"
+      app:showAsAction="always"/>
+
+  <item
+      android:id="@+id/contacts"
+      android:icon="@drawable/quantum_ic_person_white_24"
+      android:title="@string/contacts"
+      android:contentDescription="@string/description_contacts"
+      app:showAsAction="always"/>
+
+  <item
+      android:id="@+id/call_history"
+      android:title="@string/tab_title_call_history"
+      app:showAsAction="collapseActionView"/>
+
+  <item
+      android:id="@+id/settings"
+      android:title="@string/settings"
+      app:showAsAction="collapseActionView"/>
+
+  <item
+      android:id="@+id/feedback"
+      android:title="@string/main_send_feedback"
+      app:showAsAction="collapseActionView"/>
+</menu>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/res/values-af/strings.xml b/java/com/android/dialer/main/impl/res/values-af/strings.xml
new file mode 100644
index 0000000..fd1a859
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-af/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Foon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Foon-NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Oproepgeskiedenis"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Deursoek kontakte en plekke"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakte"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Bekyk kontakte"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Oproepgeskiedenis"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Spoedbel"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Stemboodskap"</string>
+    <string name="settings" msgid="7614336599112169779">"Instellings"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Stuur terugvoer"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-am/strings.xml b/java/com/android/dialer/main/impl/res/values-am/strings.xml
new file mode 100644
index 0000000..e45382b
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-am/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ስልክ"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ስልክ NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"የጥሪ ታሪክ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ዕውቂያዎችን እና ቦታዎችን ይፈልጉ"</string>
+    <string name="contacts" msgid="4464246185723317911">"እውቂያዎች"</string>
+    <string name="description_contacts" msgid="12768481422137448">"እውቂያዎችን ይመልከቱ"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"ቅንብሮች"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ar/strings.xml b/java/com/android/dialer/main/impl/res/values-ar/strings.xml
new file mode 100644
index 0000000..2be1289
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ar/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"الهاتف"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"واجهة مستخدم جديدة للهاتف"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"سجل المكالمات"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"البحث عن جهات الاتصال والأماكن"</string>
+    <string name="contacts" msgid="4464246185723317911">"جهات الاتصال"</string>
+    <string name="description_contacts" msgid="12768481422137448">"عرض جهات الاتصال"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"سجلّ المكالمات"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"اتصال سريع"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"بريد صوتي"</string>
+    <string name="settings" msgid="7614336599112169779">"الإعدادات"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"إرسال تعليقات"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-az/strings.xml b/java/com/android/dialer/main/impl/res/values-az/strings.xml
new file mode 100644
index 0000000..baa702c
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-az/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Telefon Yeni İİ"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Zəng tarixçəsi"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Kontakt və yer axtarın"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktlar"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Kontaktlara Baxın"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Ayarlar"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/main/impl/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..75be4b8
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Novi UI Telefona"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Istorija poziva"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pretražite kontakte i mesta"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakti"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Pregledajte kontakte"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Ist. poziva"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Brzo poz."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Gov. pošta"</string>
+    <string name="settings" msgid="7614336599112169779">"Podešavanja"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Pošalji povr. inform."</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-be/strings.xml b/java/com/android/dialer/main/impl/res/values-be/strings.xml
new file mode 100644
index 0000000..390eec1
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-be/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Тэлефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Новы карыстальніцкі інтэрфейс тэлефона"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Гісторыя выклікаў"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Пошук кантактаў і месцаў"</string>
+    <string name="contacts" msgid="4464246185723317911">"Кантакты"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Прагляд кантактаў"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Налады"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-bg/strings.xml b/java/com/android/dialer/main/impl/res/values-bg/strings.xml
new file mode 100644
index 0000000..075e3e9
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-bg/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Телефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Телефон – НПИ"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"История на обажданията"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Търсене на контакти и места"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контакти"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Преглед на контактите"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"История"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Бързо наб."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Гл. поща"</string>
+    <string name="settings" msgid="7614336599112169779">"Настройки"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Изпращане на отзиви"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-bn/strings.xml b/java/com/android/dialer/main/impl/res/values-bn/strings.xml
new file mode 100644
index 0000000..e5b56ff
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-bn/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ফোন"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ফোন NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"কলের ইতিহাস"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"পরিচিতি এবং স্থানগুলি অনুসন্ধান করুন"</string>
+    <string name="contacts" msgid="4464246185723317911">"পরিচিতিগুলি"</string>
+    <string name="description_contacts" msgid="12768481422137448">"পরিচিতিগুলি দেখুন"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"কলের ইতিহাস"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"দ্রুত ডায়াল"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ভয়েসমেল"</string>
+    <string name="settings" msgid="7614336599112169779">"সেটিংস"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"প্রতিক্রিয়া পাঠান"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-bs/strings.xml b/java/com/android/dialer/main/impl/res/values-bs/strings.xml
new file mode 100644
index 0000000..989fa5c
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-bs/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historija poziva"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pretraži kontakte i mjesta"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakti"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Prikaži kontakte"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"His. pozi."</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Brzo bira."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Govor. poš."</string>
+    <string name="settings" msgid="7614336599112169779">"Postavke"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Poša. povrat. infor."</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ca/strings.xml b/java/com/android/dialer/main/impl/res/values-ca/strings.xml
new file mode 100644
index 0000000..d8a4633
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ca/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telèfon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nova IU de telèfon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historial de trucades"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Cerca contactes i llocs"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contactes"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Mostra contactes"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Configuració"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-cs/strings.xml b/java/com/android/dialer/main/impl/res/values-cs/strings.xml
new file mode 100644
index 0000000..6bfc24d
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-cs/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nové rozhraní Telefonu"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historie volání"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Hledat kontakty a místa"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakty"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Zobrazit kontakty"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Nastavení"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-da/strings.xml b/java/com/android/dialer/main/impl/res/values-da/strings.xml
new file mode 100644
index 0000000..1dc96da
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-da/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Ny genvej til telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Opkaldshistorik"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Søg efter kontaktpersoner og steder"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktpersoner"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Se kontaktpersoner"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Indstillinger"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-de/strings.xml b/java/com/android/dialer/main/impl/res/values-de/strings.xml
new file mode 100644
index 0000000..a305ed4
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-de/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Neue Benutzeroberfläche für Telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Anrufliste"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Kontakte und Orte suchen"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakte"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Kontakte ansehen"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Anrufliste"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Kurzwahl"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Mailbox"</string>
+    <string name="settings" msgid="7614336599112169779">"Einstellungen"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Feedback geben"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-el/strings.xml b/java/com/android/dialer/main/impl/res/values-el/strings.xml
new file mode 100644
index 0000000..df58b08
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-el/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Τηλέφωνο"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Νέα διεπαφή χρήστη για το Τηλέφωνο"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Ιστορικό κλήσεων"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Αναζητήστε επαφές και μέρη"</string>
+    <string name="contacts" msgid="4464246185723317911">"Επαφές"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Προβολή επαφών"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Ρυθμίσεις"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-en-rAU/strings.xml b/java/com/android/dialer/main/impl/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..b6c139f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-en-rAU/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telephone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Call history"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Search contacts and places"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacts"</string>
+    <string name="description_contacts" msgid="12768481422137448">"View contacts"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Call history"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Speed dial"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Voicemail"</string>
+    <string name="settings" msgid="7614336599112169779">"Settings"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Sending feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-en-rGB/strings.xml b/java/com/android/dialer/main/impl/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..b6c139f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-en-rGB/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telephone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Call history"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Search contacts and places"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacts"</string>
+    <string name="description_contacts" msgid="12768481422137448">"View contacts"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Call history"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Speed dial"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Voicemail"</string>
+    <string name="settings" msgid="7614336599112169779">"Settings"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Sending feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-en-rIN/strings.xml b/java/com/android/dialer/main/impl/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..b6c139f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-en-rIN/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telephone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Call history"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Search contacts and places"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacts"</string>
+    <string name="description_contacts" msgid="12768481422137448">"View contacts"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Call history"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Speed dial"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Voicemail"</string>
+    <string name="settings" msgid="7614336599112169779">"Settings"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Sending feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-es-rUS/strings.xml b/java/com/android/dialer/main/impl/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..6ddb775
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-es-rUS/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Teléfono"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nueva IU del teléfono"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historial de llamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Buscar contactos y lugares"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contactos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ver contactos"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Configuración"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-es/strings.xml b/java/com/android/dialer/main/impl/res/values-es/strings.xml
new file mode 100644
index 0000000..5ccc9e9
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-es/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Teléfono"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nueva interfaz de usuario del teléfono"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historial de llamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Buscar contactos y sitios"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contactos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ver contactos"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Historial"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Marcación"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Buzón"</string>
+    <string name="settings" msgid="7614336599112169779">"Ajustes"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Enviar comentarios"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-et/strings.xml b/java/com/android/dialer/main/impl/res/values-et/strings.xml
new file mode 100644
index 0000000..1e681a9
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-et/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Telefoni uus kasutajaliides"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Kõneajalugu"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Otsige kontakte ja soovitusi"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktid"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Vaadake kontakte"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Seaded"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-eu/strings.xml b/java/com/android/dialer/main/impl/res/values-eu/strings.xml
new file mode 100644
index 0000000..3204c43
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-eu/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefonoa"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Telefonoko erabiltzaile-interfaze naturala"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Deien historia"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Ikusi kontaktuak eta tokiak"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktuak"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ikusi kontaktuak"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Ezarpenak"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-fa/strings.xml b/java/com/android/dialer/main/impl/res/values-fa/strings.xml
new file mode 100644
index 0000000..82ba23b
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-fa/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"تلفن"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"رابط کاربری جدید تلفن"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"سابقه تماس"</string>
+    <string name="search" msgid="3570654445331155513">"‎@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"جستجوی مخاطبین و مکان‌ها"</string>
+    <string name="contacts" msgid="4464246185723317911">"مخاطبین"</string>
+    <string name="description_contacts" msgid="12768481422137448">"مشاهده مخاطبین"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"تنظیمات"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-fi/strings.xml b/java/com/android/dialer/main/impl/res/values-fi/strings.xml
new file mode 100644
index 0000000..f997a30
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-fi/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Puhelin"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Puhelimen uusi UI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Soittohistoria"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/haku_aloita"</string>
+    <string name="description_search" msgid="3443578912463129718">"Haku yhteystiedoista ja paikoista"</string>
+    <string name="contacts" msgid="4464246185723317911">"Yhteystiedot"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Näytä yhteystiedot"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Asetukset"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-fr-rCA/strings.xml b/java/com/android/dialer/main/impl/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..5d81972
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-fr-rCA/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Téléphoner"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Téléphoner (nouvelle IU)"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historique des appels"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Rechercher dans les contacts et les lieux"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacts"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Afficher les contacts"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Appels"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Comp. abr."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Mess. voc."</string>
+    <string name="settings" msgid="7614336599112169779">"Paramètres"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Envoyer commentaires"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-fr/strings.xml b/java/com/android/dialer/main/impl/res/values-fr/strings.xml
new file mode 100644
index 0000000..613ffb2
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-fr/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Téléphone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Téléphone (nouvelle version)"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historique des appels"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Recherchez des contacts et des adresses"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacts"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Consultez vos contacts"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Historique"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Num. abrégée"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Messagerie"</string>
+    <string name="settings" msgid="7614336599112169779">"Paramètres"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Laisser un avis"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-gl/strings.xml b/java/com/android/dialer/main/impl/res/values-gl/strings.xml
new file mode 100644
index 0000000..a8b4b4e
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-gl/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Teléfono"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nova IU do teléfono"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historial de chamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Busca contactos e lugares"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contactos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Mira os contactos"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Historial"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Marc. ráp."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Correo voz"</string>
+    <string name="settings" msgid="7614336599112169779">"Configuración"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Enviar comentarios"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-gu/strings.xml b/java/com/android/dialer/main/impl/res/values-gu/strings.xml
new file mode 100644
index 0000000..2bf6137
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-gu/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ફોન"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ફોન NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"કૉલ ઇતિહાસ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"સંપર્કો અને સ્થાનો શોધો"</string>
+    <string name="contacts" msgid="4464246185723317911">"સંપર્કો"</string>
+    <string name="description_contacts" msgid="12768481422137448">"સંપર્કો જુઓ"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"કૉલ ઇતિહાસ"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"સ્પીડ ડાયલ"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"વૉઇસમેઇલ"</string>
+    <string name="settings" msgid="7614336599112169779">"સેટિંગ્સ"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"પ્રતિસાદ મોકલો"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-hi/strings.xml b/java/com/android/dialer/main/impl/res/values-hi/strings.xml
new file mode 100644
index 0000000..99cc780
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-hi/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"फ़ोन"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"फ़ोन NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"कॉल इतिहास"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"संपर्क और स्थान खोजें"</string>
+    <string name="contacts" msgid="4464246185723317911">"संपर्क"</string>
+    <string name="description_contacts" msgid="12768481422137448">"संपर्क देखें"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"कॉल इतिहास"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"स्पीड डायल"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"वॉइसमेल"</string>
+    <string name="settings" msgid="7614336599112169779">"सेटिंग"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"फ़ीडबैक भेजें"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-hr/strings.xml b/java/com/android/dialer/main/impl/res/values-hr/strings.xml
new file mode 100644
index 0000000..037dd12
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-hr/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI telefona"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Povijest poziva"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pretraži kontakte i mjesta"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakti"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Prikaži kontakte"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Postavke"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-hu/strings.xml b/java/com/android/dialer/main/impl/res/values-hu/strings.xml
new file mode 100644
index 0000000..f86ed24
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-hu/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Telefon új felhasználói felülete"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Híváslista"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Névjegyek és helyek keresése"</string>
+    <string name="contacts" msgid="4464246185723317911">"Névjegyek"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Névjegyek megtekintése"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Beállítások"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-hy/strings.xml b/java/com/android/dialer/main/impl/res/values-hy/strings.xml
new file mode 100644
index 0000000..e8334ca
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-hy/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Հեռախոս"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Հեռախոսի նոր միջերես"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Զանգերի պատմություն"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Գտնել կոնտակտներ և վայրեր"</string>
+    <string name="contacts" msgid="4464246185723317911">"Կոնտակտներ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Դիտել կոնտակտները"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Զանգերի պատմ."</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Արագ հավաքում"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Ձայն. փոստ"</string>
+    <string name="settings" msgid="7614336599112169779">"Կարգավորումներ"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Կարծիք հայտնել"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-in/strings.xml b/java/com/android/dialer/main/impl/res/values-in/strings.xml
new file mode 100644
index 0000000..f3effe1
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-in/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telepon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI Telepon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Histori panggilan"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Telusuri kontak dan tempat"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontak"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Lihat Kontak"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Setelan"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-is/strings.xml b/java/com/android/dialer/main/impl/res/values-is/strings.xml
new file mode 100644
index 0000000..988eef4
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-is/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Sími"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nýtt viðmót síma"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Símtalaferill"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Leita að tengiliðum og stöðum"</string>
+    <string name="contacts" msgid="4464246185723317911">"Tengiliðir"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Skoða tengiliði"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Stillingar"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-it/strings.xml b/java/com/android/dialer/main/impl/res/values-it/strings.xml
new file mode 100644
index 0000000..324359f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-it/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefono"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI telefono"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Cronologia chiamate"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Cerca contatti e luoghi"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contatti"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Visualizza contatti"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Impostazioni"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-iw/strings.xml b/java/com/android/dialer/main/impl/res/values-iw/strings.xml
new file mode 100644
index 0000000..645ef20
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-iw/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"טלפון"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ממשק משתמש חדש לטלפון"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"היסטוריית שיחות"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"חיפוש אנשי קשר ומקומות"</string>
+    <string name="contacts" msgid="4464246185723317911">"אנשי קשר"</string>
+    <string name="description_contacts" msgid="12768481422137448">"הצגת אנשי הקשר"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"היסטוריית שיחות"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"חיוג מהיר"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"דואר קולי"</string>
+    <string name="settings" msgid="7614336599112169779">"הגדרות"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"משוב"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ja/strings.xml b/java/com/android/dialer/main/impl/res/values-ja/strings.xml
new file mode 100644
index 0000000..5791538
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ja/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"電話"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"電話 NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"通話履歴"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"連絡先や場所を検索"</string>
+    <string name="contacts" msgid="4464246185723317911">"連絡先"</string>
+    <string name="description_contacts" msgid="12768481422137448">"連絡先を表示"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"設定"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ka/strings.xml b/java/com/android/dialer/main/impl/res/values-ka/strings.xml
new file mode 100644
index 0000000..e2570a1
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ka/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ტელეფონი"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ტელეფონის NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ზარების ისტორია"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"კონტაქტებისა და ადგილების ძიება"</string>
+    <string name="contacts" msgid="4464246185723317911">"კონტაქტები"</string>
+    <string name="description_contacts" msgid="12768481422137448">"კონტაქტების ნახვა"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"პარამეტრები"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-kk/strings.xml b/java/com/android/dialer/main/impl/res/values-kk/strings.xml
new file mode 100644
index 0000000..e29f53a
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-kk/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Телефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Телефонға арналған жаңа пайдаланушы интерфейсі"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Қоңыраулар тарихы"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Контактілер мен орындарды іздеу"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контактілер"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Контактілерді көру"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Параметрлер"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-km/strings.xml b/java/com/android/dialer/main/impl/res/values-km/strings.xml
new file mode 100644
index 0000000..c6c6dc5
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-km/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ទូរសព្ទ"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI ទូរសព្ទ"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ប្រវត្តិហៅ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ទំនាក់ទំនង និង​កន្លែង​ស្វែងរក"</string>
+    <string name="contacts" msgid="4464246185723317911">"ទំនាក់ទំនង"</string>
+    <string name="description_contacts" msgid="12768481422137448">"មើលទំនាក់ទំនង"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"ការ​កំណត់"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-kn/strings.xml b/java/com/android/dialer/main/impl/res/values-kn/strings.xml
new file mode 100644
index 0000000..48b8f83
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-kn/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ಫೋನ್"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ಫೋನ್ NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ಕರೆ ಇತಿಹಾಸ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ಸಂಪರ್ಕಗಳು ಮತ್ತು ಸ್ಥಳಗಳನ್ನು ಹುಡುಕಿ"</string>
+    <string name="contacts" msgid="4464246185723317911">"ಸಂಪರ್ಕಗಳು"</string>
+    <string name="description_contacts" msgid="12768481422137448">"ಸಂಪರ್ಕ ವೀಕ್ಷಿಸು"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ko/strings.xml b/java/com/android/dialer/main/impl/res/values-ko/strings.xml
new file mode 100644
index 0000000..1f98f7f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ko/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"전화"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"새 전화 UI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"통화 기록"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"연락처 및 장소 검색"</string>
+    <string name="contacts" msgid="4464246185723317911">"연락처"</string>
+    <string name="description_contacts" msgid="12768481422137448">"연락처 보기"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"통화 기록"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"단축 다이얼"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"음성사서함"</string>
+    <string name="settings" msgid="7614336599112169779">"설정"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"의견 보내기"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ky/strings.xml b/java/com/android/dialer/main/impl/res/values-ky/strings.xml
new file mode 100644
index 0000000..66f06d2
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ky/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Чалуу"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Жаы интерфейсте чалуу"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Чалуулар таржымалы"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Байланыштарды жана жерлерди издөө"</string>
+    <string name="contacts" msgid="4464246185723317911">"Байланыштар"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Байланыштарды көрүү"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Жөндөөлөр"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-lo/strings.xml b/java/com/android/dialer/main/impl/res/values-lo/strings.xml
new file mode 100644
index 0000000..8b7e547
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-lo/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ໂທລະສັບ"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ປະຫວັດການໂທ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ຊອກຫາລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ສະຖານທີ່"</string>
+    <string name="contacts" msgid="4464246185723317911">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="description_contacts" msgid="12768481422137448">"ເບິ່ງລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ປະຫວັດການໂທ"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"ໂທດ່ວນ"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ຂໍ້ຄວາມສຽງ"</string>
+    <string name="settings" msgid="7614336599112169779">"ການຕັ້ງຄ່າ"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ສົ່ງຄຳຕິຊົມ"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-lt/strings.xml b/java/com/android/dialer/main/impl/res/values-lt/strings.xml
new file mode 100644
index 0000000..4b3e3b9
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-lt/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefonas"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nauja telefono NS"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Skambučių istorija"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Ieškoti kontaktų ir vietų"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktai"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Žr. kontaktus"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Sk. istor."</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Sp. rink."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Balso p."</string>
+    <string name="settings" msgid="7614336599112169779">"Nustatymai"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Siųsti atsiliepimą"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-lv/strings.xml b/java/com/android/dialer/main/impl/res/values-lv/strings.xml
new file mode 100644
index 0000000..459950b
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-lv/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Tālrunis"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Tālruņa jaunā lietotāja saskarne"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Zvanu vēsture"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Meklēt kontaktpersonas un vietas"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktpersonas"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Skatīt kontaktpersonas"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Iestatījumi"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-mk/strings.xml b/java/com/android/dialer/main/impl/res/values-mk/strings.xml
new file mode 100644
index 0000000..0543f33
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-mk/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Телефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Нов интерфејс на телефон"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Историја на повици"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Пребарајте контакти и места"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контакти"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Прикажи контакти"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Поставки"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ml/strings.xml b/java/com/android/dialer/main/impl/res/values-ml/strings.xml
new file mode 100644
index 0000000..d143e6c
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ml/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ഫോണ്‍"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ഫോൺ NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"കോള്‍‌ ചരിത്രം"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"കോൺടാക്റ്റുകളും സ്ഥലങ്ങളും തിരയുക"</string>
+    <string name="contacts" msgid="4464246185723317911">"കോൺടാക്റ്റുകൾ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"കോൺടാക്റ്റുകൾ കാണുക"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"ക്രമീകരണം"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-mn/strings.xml b/java/com/android/dialer/main/impl/res/values-mn/strings.xml
new file mode 100644
index 0000000..6dee167
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-mn/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Утас"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Утас NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Дуудлагын түүх"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Харилцагчид, газруудаас хайх"</string>
+    <string name="contacts" msgid="4464246185723317911">"Харилцагчид"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Харилцагчдыг харах"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Дуудлагын түүх"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Шуурхай залгах"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Дуут шуудан"</string>
+    <string name="settings" msgid="7614336599112169779">"Тохиргоо"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Санал хүсэл илгээх"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-mr/strings.xml b/java/com/android/dialer/main/impl/res/values-mr/strings.xml
new file mode 100644
index 0000000..4662461
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-mr/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"फोन"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"फोन NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"कॉल इतिहास"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"संपर्क आणि स्थाने शोधा"</string>
+    <string name="contacts" msgid="4464246185723317911">"संपर्क"</string>
+    <string name="description_contacts" msgid="12768481422137448">"संपर्क पहा"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"कॉल इतिहास"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"जलद डायल"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"व्हॉइसमेल"</string>
+    <string name="settings" msgid="7614336599112169779">"सेटिंग्ज"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"अभिप्राय पाठवा"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ms/strings.xml b/java/com/android/dialer/main/impl/res/values-ms/strings.xml
new file mode 100644
index 0000000..36cb14b
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ms/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI Telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Sejarah panggilan"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Cari kenalan dan tempat"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kenalan"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Lihat Kenalan"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Sjrh Pgln"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Dail Laju"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Mel suara"</string>
+    <string name="settings" msgid="7614336599112169779">"Tetapan"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Hantar maklum balas"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-my/strings.xml b/java/com/android/dialer/main/impl/res/values-my/strings.xml
new file mode 100644
index 0000000..b71a8a5
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-my/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ဖုန်း"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI ဖုန်း"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ခေါ်ဆိုမှုမှတ်တမ်း"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"အဆက်အသွယ်များနှင့် နေရာများကို ရှာဖွေရန်"</string>
+    <string name="contacts" msgid="4464246185723317911">"အဆက်အသွယ်များ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"အဆက်အသွယ်များကို ကြည့်ရှုရန်"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ခေါ်ဆိုမှု"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"နံပါတ်ကွက်"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"အသံမေးလ်"</string>
+    <string name="settings" msgid="7614336599112169779">"ဆက်တင်များ"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"အကြံပြုချက် ပို့ရန်"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-nb/strings.xml b/java/com/android/dialer/main/impl/res/values-nb/strings.xml
new file mode 100644
index 0000000..fa89e4c
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-nb/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Anropslogg"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Søk etter kontakter og steder"</string>
+    <string name="contacts" msgid="4464246185723317911">"Google-kontakter"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Se kontakter"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Innstillinger"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ne/strings.xml b/java/com/android/dialer/main/impl/res/values-ne/strings.xml
new file mode 100644
index 0000000..794b058
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ne/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"फोन"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI फोन"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"कलको इतिहास"</string>
+    <string name="search" msgid="3570654445331155513">"@android:स्ट्रिङ/खोज_जानुहोस्"</string>
+    <string name="description_search" msgid="3443578912463129718">"सम्पर्क र स्थानहरू खोज्‍नुहोस्"</string>
+    <string name="contacts" msgid="4464246185723317911">"सम्पर्कहरू"</string>
+    <string name="description_contacts" msgid="12768481422137448">"सम्पर्कहरू हेर्नुहोस्"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"कल इतिहास"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"स्पिड डायल"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"भ्वाइस मेल"</string>
+    <string name="settings" msgid="7614336599112169779">"सेटिङहरू"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"प्रतिक्रिया पठाउने"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-nl/strings.xml b/java/com/android/dialer/main/impl/res/values-nl/strings.xml
new file mode 100644
index 0000000..cf00e19
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-nl/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Bellen"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nieuwe UI van telefoon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Oproepgeschiedenis"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Contacten en plaatsen zoeken"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacten"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Contacten bekijken"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Instellingen"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-no/strings.xml b/java/com/android/dialer/main/impl/res/values-no/strings.xml
new file mode 100644
index 0000000..fa89e4c
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-no/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Anropslogg"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Søk etter kontakter og steder"</string>
+    <string name="contacts" msgid="4464246185723317911">"Google-kontakter"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Se kontakter"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Innstillinger"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-pa/strings.xml b/java/com/android/dialer/main/impl/res/values-pa/strings.xml
new file mode 100644
index 0000000..57d3334
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-pa/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ਫ਼ੋਨ"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ਫ਼ੋਨ NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ਕਾਲ ਇਤਿਹਾਸ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ਸੰਪਰਕਾਂ ਅਤੇ ਥਾਂਵਾਂ ਨੂੰ ਖੋਜੋ"</string>
+    <string name="contacts" msgid="4464246185723317911">"ਸੰਪਰਕ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"ਸੰਪਰਕ ਵੇਖੋ"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ਕਾਲ ਇਤਿਹਾਸ"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"ਸਪੀਡ ਡਾਇਲ"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ਵੌਇਸਮੇਲ"</string>
+    <string name="settings" msgid="7614336599112169779">"ਸੈਟਿੰਗਾਂ"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ਪ੍ਰਤੀਕਰਮ ਭੇਜੋ"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-pl/strings.xml b/java/com/android/dialer/main/impl/res/values-pl/strings.xml
new file mode 100644
index 0000000..70f535e
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-pl/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nowy interfejs telefonu"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historia połączeń"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Wyszukaj kontakty i miejsca"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakty"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Wyświetl kontakty"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Historia połączeń"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Szybkie wybieranie"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Poczta głosowa"</string>
+    <string name="settings" msgid="7614336599112169779">"Ustawienia"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Prześlij opinię"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-pt-rBR/strings.xml b/java/com/android/dialer/main/impl/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..e408d65
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-pt-rBR/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nova IU: Telefone"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Histórico de chamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pesquisar contatos e lugares"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contatos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ver contatos"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Configurações"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-pt-rPT/strings.xml b/java/com/android/dialer/main/impl/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..33c1451
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-pt-rPT/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NIU do telemóvel"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Histórico de chamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pesquisar contactos e locais"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contactos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ver contactos"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Definições"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-pt/strings.xml b/java/com/android/dialer/main/impl/res/values-pt/strings.xml
new file mode 100644
index 0000000..e408d65
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-pt/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nova IU: Telefone"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Histórico de chamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pesquisar contatos e lugares"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contatos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ver contatos"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Configurações"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ro/strings.xml b/java/com/android/dialer/main/impl/res/values-ro/strings.xml
new file mode 100644
index 0000000..674e494
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ro/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Noua IU pentru Telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Istoricul apelurilor"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Căutați persoane de contact și locuri"</string>
+    <string name="contacts" msgid="4464246185723317911">"Agendă"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Afișați Agenda"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Setări"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ru/strings.xml b/java/com/android/dialer/main/impl/res/values-ru/strings.xml
new file mode 100644
index 0000000..d6d4918
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ru/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Позвонить"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Позвонить в новом интерфейсе"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Журнал звонков"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Поиск контактов и мест"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контакты"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Посмотреть контакты"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Настройки"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-si/strings.xml b/java/com/android/dialer/main/impl/res/values-si/strings.xml
new file mode 100644
index 0000000..c3c4b80
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-si/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"දුරකථනය"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ඇමතුම් ඉතිහාසය"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"සම්බන්ධතා සහ ස්ථාන සොයන්න"</string>
+    <string name="contacts" msgid="4464246185723317911">"සම්බන්ධතා"</string>
+    <string name="description_contacts" msgid="12768481422137448">"සම්බන්ධතා බලන්න"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"සැකසීම්"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sk/strings.xml b/java/com/android/dialer/main/impl/res/values-sk/strings.xml
new file mode 100644
index 0000000..d5ee882
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sk/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefón"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nové rozhranie Telefónu"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"História hovorov"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Hľadať kontakty a miesta"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakty"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Zobraziť kontakty"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Nastavenia"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sl/strings.xml b/java/com/android/dialer/main/impl/res/values-sl/strings.xml
new file mode 100644
index 0000000..44fb501
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sl/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nov uporabniški vmesnik za telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Zgodovina klicev"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Iskanje po stikih in mestih"</string>
+    <string name="contacts" msgid="4464246185723317911">"Stiki"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Prikaz stikov"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Nastavitve"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sq/strings.xml b/java/com/android/dialer/main/impl/res/values-sq/strings.xml
new file mode 100644
index 0000000..c2e3664
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sq/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefoni"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Ndërfaqja e re e përdoruesit e telefonit"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historiku i telefonatave"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Kërko për kontakte dhe vende"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktet"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Shiko kontaktet"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Cilësimet"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sr/strings.xml b/java/com/android/dialer/main/impl/res/values-sr/strings.xml
new file mode 100644
index 0000000..542460e
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sr/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Телефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Нови UI Телефона"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Историја позива"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Претражите контакте и места"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контакти"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Прегледајте контакте"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Ист. позива"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Брзо поз."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Гов. пошта"</string>
+    <string name="settings" msgid="7614336599112169779">"Подешавања"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Пошаљи повр. информ."</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sv/strings.xml b/java/com/android/dialer/main/impl/res/values-sv/strings.xml
new file mode 100644
index 0000000..cefefb3
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sv/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nytt användargränssnitt för telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Samtalshistorik"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Sök efter kontakter och platser"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakter"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Visa kontakter"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Samt.hist."</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Snabbval"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Röstbrevl."</string>
+    <string name="settings" msgid="7614336599112169779">"Inställningar"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Skicka feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sw/strings.xml b/java/com/android/dialer/main/impl/res/values-sw/strings.xml
new file mode 100644
index 0000000..158afa3
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sw/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Simu"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI ya Simu"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Rekodi ya simu zilizopigwa"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Tafuta anwani na mahali"</string>
+    <string name="contacts" msgid="4464246185723317911">"Anwani"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Angalia Anwani"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Mipangilio"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ta/strings.xml b/java/com/android/dialer/main/impl/res/values-ta/strings.xml
new file mode 100644
index 0000000..81e02ef
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ta/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ஃபோன்"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ஃபோன் NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"அழைப்பு வரலாறு"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"தொடர்புகளையும் இடங்களையும் தேடுவதற்கான பொத்தான்"</string>
+    <string name="contacts" msgid="4464246185723317911">"தொடர்புகள்"</string>
+    <string name="description_contacts" msgid="12768481422137448">"தொடர்புகளைக் காட்டுவதற்கான பொத்தான்"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"கால் தகவல்"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"ஸ்பீட்டைல்"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"குரலஞ்சல்"</string>
+    <string name="settings" msgid="7614336599112169779">"அமைப்புகள்"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"கருத்துத் தெரிவி"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-te/strings.xml b/java/com/android/dialer/main/impl/res/values-te/strings.xml
new file mode 100644
index 0000000..c337cf3
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-te/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ఫోన్"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ఫోన్ NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"కాల్ చరిత్ర"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"పరిచయాలు మరియు స్థలాలను శోధించు"</string>
+    <string name="contacts" msgid="4464246185723317911">"పరిచయాలు"</string>
+    <string name="description_contacts" msgid="12768481422137448">"పరిచయాలను వీక్షించండి"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"కాల్ చరిత్ర"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"స్పీడ్ డయల్"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"వాయిస్ మెయిల్"</string>
+    <string name="settings" msgid="7614336599112169779">"సెట్టింగ్‌లు"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"అభిప్రాయాన్ని పంపండి"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-th/strings.xml b/java/com/android/dialer/main/impl/res/values-th/strings.xml
new file mode 100644
index 0000000..aa83f81
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-th/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"โทรศัพท์"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI ของโทรศัพท์"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ประวัติการโทร"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ค้นหารายชื่อติดต่อและสถานที่"</string>
+    <string name="contacts" msgid="4464246185723317911">"รายชื่อติดต่อ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"ดูรายชื่อติดต่อ"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ประวัติการโทร"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"โทรด่วน"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ข้อความเสียง"</string>
+    <string name="settings" msgid="7614336599112169779">"การตั้งค่า"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ส่งความคิดเห็น"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-tl/strings.xml b/java/com/android/dialer/main/impl/res/values-tl/strings.xml
new file mode 100644
index 0000000..ca3bd6d
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-tl/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telepono"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI ng telepono"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"History ng tawag"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Maghanap ng mga contact at mga lugar"</string>
+    <string name="contacts" msgid="4464246185723317911">"Mga Contact"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Tingnan ang Mga Contact"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Mga Setting"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-tr/strings.xml b/java/com/android/dialer/main/impl/res/values-tr/strings.xml
new file mode 100644
index 0000000..623c156
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-tr/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Telefonun Yeni Kullanıcı Arayüzü"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Çağrı geçmişi"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Kişileri ve yerleri ara"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kişiler"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Kişileri Göster"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Ayarlar"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-uk/strings.xml b/java/com/android/dialer/main/impl/res/values-uk/strings.xml
new file mode 100644
index 0000000..7691054
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-uk/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Телефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Новий елемент інтерфейсу телефону"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Історія дзвінків"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Шукати контакти й місця"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контакти"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Переглянути контакти"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Історія"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Шв. набір"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Гол. пошта"</string>
+    <string name="settings" msgid="7614336599112169779">"Налаштування"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Надіслати відгук"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ur/strings.xml b/java/com/android/dialer/main/impl/res/values-ur/strings.xml
new file mode 100644
index 0000000..5795faa
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ur/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"فون"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"‏فون NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"کال کی سرگزشت"</string>
+    <string name="search" msgid="3570654445331155513">"‎@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"رابطے اور مقامات تلاش کریں"</string>
+    <string name="contacts" msgid="4464246185723317911">"رابطے"</string>
+    <string name="description_contacts" msgid="12768481422137448">"رابطے دیکھیں"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"کال کی سرگزشت"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"اسپیڈ ڈائل"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"صوتی میل"</string>
+    <string name="settings" msgid="7614336599112169779">"ترتیبات"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"تاثرات بھیجیں"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-uz/strings.xml b/java/com/android/dialer/main/impl/res/values-uz/strings.xml
new file mode 100644
index 0000000..be14286
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-uz/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Qo‘ng‘iroq qilish"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Yangi interfeysdan foydalanib qo‘ng‘iroq qilish"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Qo‘ng‘iroqlar tarixi"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Kontakt va joylarni qidirish"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktlar"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Kontaktlarni ko‘rish"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Sozlamalar"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-vi/strings.xml b/java/com/android/dialer/main/impl/res/values-vi/strings.xml
new file mode 100644
index 0000000..768167a
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-vi/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Điện thoại"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI điện thoại"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Nhật ký cuộc gọi"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Tìm kiếm liên hệ và địa điểm"</string>
+    <string name="contacts" msgid="4464246185723317911">"Danh bạ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Xem Danh bạ"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Cài đặt"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-zh-rCN/strings.xml b/java/com/android/dialer/main/impl/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..9649748
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-zh-rCN/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"拨打电话"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"电话 NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"通话记录"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"搜索联系人和地点"</string>
+    <string name="contacts" msgid="4464246185723317911">"联系人"</string>
+    <string name="description_contacts" msgid="12768481422137448">"查看联系人"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"通话记录"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"快速拨号"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"语音邮件"</string>
+    <string name="settings" msgid="7614336599112169779">"设置"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"发送反馈"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-zh-rHK/strings.xml b/java/com/android/dialer/main/impl/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..5595a9d
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-zh-rHK/strings.xml
@@ -0,0 +1,32 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"電話"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"電話 NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"通話記錄"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"搜尋聯絡人和地點"</string>
+    <string name="contacts" msgid="4464246185723317911">"通訊錄"</string>
+    <string name="description_contacts" msgid="12768481422137448">"查看通訊錄"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"通話記錄"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"快速撥號"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"留言"</string>
+    <string name="settings" msgid="7614336599112169779">"設定"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"提供意見"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-zh-rTW/strings.xml b/java/com/android/dialer/main/impl/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..0ae532e
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-zh-rTW/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"手機"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"手機 NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"通話紀錄"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"搜尋聯絡人和地點"</string>
+    <string name="contacts" msgid="4464246185723317911">"聯絡人"</string>
+    <string name="description_contacts" msgid="12768481422137448">"查看聯絡人"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"設定"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-zu/strings.xml b/java/com/android/dialer/main/impl/res/values-zu/strings.xml
new file mode 100644
index 0000000..408acac
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-zu/strings.xml
@@ -0,0 +1,36 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Ifoni"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"I-Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Umlando wekholi"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Sesha oxhumana nabo nezindawo"</string>
+    <string name="contacts" msgid="4464246185723317911">"Oxhumana nabo"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Buka oxhumana nabo"</string>
+    <!-- no translation found for tab_title_call_history (5191872501729332994) -->
+    <skip />
+    <!-- no translation found for tab_title_speed_dial (1968484500112572774) -->
+    <skip />
+    <!-- no translation found for tab_title_voicemail (4777655983569268504) -->
+    <skip />
+    <string name="settings" msgid="7614336599112169779">"Izilungiselelo"</string>
+    <!-- no translation found for main_send_feedback (2446919533981327373) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values/strings.xml b/java/com/android/dialer/main/impl/res/values/strings.xml
new file mode 100644
index 0000000..ba8a20b
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values/strings.xml
@@ -0,0 +1,49 @@
+<?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>
+  <!-- Name of the main activity. -->
+  <string name="main_activity_label">Phone</string>
+
+  <!-- Name of launcher shortcut for the new UI main activity.
+       TODO(38502365): Remove this once we're ready to launch the new UI. -->
+  <string name="nui_shortcut_name">Phone NUI</string>
+
+  <!-- The description text for the call log tab. -->
+  <string name="main_call_history_tab_description">Call history</string>
+
+  <!-- Text for a toolbar button that shows the user their contacts [CHAR LIMIT=NONE] -->
+  <string name="search">@android:string/search_go</string>
+  <!-- A11y announcement to let users know a button will let them search for contacts and places [CHAR LIMIT=NONE] -->
+  <string name="description_search">Search contacts and places</string>
+
+  <!-- Text for a toolbar button that shows the user their contacts [CHAR LIMIT=NONE] -->
+  <string name="contacts">Contacts</string>
+  <!-- A11y announcement to let users know a button will let them view their contacts [CHAR LIMIT=NONE] -->
+  <string name="description_contacts">View Contacts</string>
+
+  <!-- Tab text to show users their call log/call history [CHAR LIMIT=10] -->
+  <string name="tab_title_call_history">Call History</string>
+  <!-- Tab text to show users their favorite contacts that they can call in 1 click [CHAR LIMIT=10] -->
+  <string name="tab_title_speed_dial">Speed Dial</string>
+  <!-- Tab text to show users their voicemails  [CHAR LIMIT=10] -->
+  <string name="tab_title_voicemail">Voicemail</string>
+
+  <!-- Show users their settings [CHAR LIMIT=20] -->
+  <string name="settings">Settings</string>
+  <!-- Send feedback about the app [CHAR LIMIT=20] -->
+  <string name="main_send_feedback">Send feedback</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml
new file mode 100644
index 0000000..38c5008
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values/styles.xml
@@ -0,0 +1,28 @@
+<?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>
+  <style name="NuiMainActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="android:colorPrimary">@color/dialtacts_theme_color</item>
+    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
+    <item name="android:colorAccent">@color/dialer_secondary_color</item>
+  </style>
+
+  <style name="AppBarTheme" parent="Theme.AppCompat">
+    <item name="android:colorPrimary">@color/dialtacts_theme_color</item>
+    <item name="android:colorAccent">@color/dialer_secondary_color</item>
+  </style>
+</resources>
diff --git a/java/com/android/dialer/notification/AndroidManifest.xml b/java/com/android/dialer/notification/AndroidManifest.xml
index 741f481..b89d8f8 100644
--- a/java/com/android/dialer/notification/AndroidManifest.xml
+++ b/java/com/android/dialer/notification/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2017 The Android Open Source Project
   ~
@@ -13,19 +14,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-
-<manifest
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.notification">
-
-  <uses-sdk android:minSdkVersion="23"/>
-  <application>
-    <receiver android:name=".PackageUpdatedReceiver"
-              android:directBootAware="true">
-      <intent-filter>
-        <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
-        <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED"/>
-      </intent-filter>
-    </receiver>
-  </application>
 </manifest>
diff --git a/java/com/android/dialer/notification/GroupedNotificationUtil.java b/java/com/android/dialer/notification/GroupedNotificationUtil.java
deleted file mode 100644
index 3925248..0000000
--- a/java/com/android/dialer/notification/GroupedNotificationUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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
- */
-
-package com.android.dialer.notification;
-
-import android.app.NotificationManager;
-import android.service.notification.StatusBarNotification;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import java.util.Objects;
-
-/** Utilities for dealing with grouped notifications */
-public final class GroupedNotificationUtil {
-
-  /**
-   * Remove notification(s) that were added as part of a group. Will ensure that if this is the last
-   * notification in the group the summary will be removed.
-   *
-   * @param tag String tag as included in {@link NotificationManager#notify(String, int,
-   *     android.app.Notification)}. If null will remove all notifications under id
-   * @param id notification id as included with {@link NotificationManager#notify(String, int,
-   *     android.app.Notification)}.
-   * @param summaryTag String tag of the summary notification
-   */
-  public static void removeNotification(
-      @NonNull NotificationManager notificationManager,
-      @Nullable String tag,
-      int id,
-      @NonNull String summaryTag) {
-    if (tag == null) {
-      // Clear all grouped notifications
-      for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
-        if (notification.getId() == id) {
-          notificationManager.cancel(notification.getTag(), id);
-        }
-      }
-    } else {
-      notificationManager.cancel(tag, id);
-
-      // See if other non-summary grouped notifications exist, and if not then clear the summary
-      boolean clearSummary = true;
-      for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
-        if (notification.getId() == id && !Objects.equals(summaryTag, notification.getTag())) {
-          clearSummary = false;
-          break;
-        }
-      }
-      if (clearSummary) {
-        notificationManager.cancel(summaryTag, id);
-      }
-    }
-  }
-}
diff --git a/java/com/android/dialer/notification/NotificationChannelId.java b/java/com/android/dialer/notification/NotificationChannelId.java
new file mode 100644
index 0000000..4ab3d44
--- /dev/null
+++ b/java/com/android/dialer/notification/NotificationChannelId.java
@@ -0,0 +1,41 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.notification;
+
+import android.support.annotation.StringDef;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Centralized source of all notification channels used by Dialer. */
+@Retention(RetentionPolicy.SOURCE)
+@StringDef({
+  NotificationChannelId.INCOMING_CALL,
+  NotificationChannelId.ONGOING_CALL,
+  NotificationChannelId.MISSED_CALL,
+  NotificationChannelId.DEFAULT,
+})
+public @interface NotificationChannelId {
+  // This value is white listed in the system.
+  // See /vendor/google/nexus_overlay/common/frameworks/base/core/res/res/values/config.xml
+  String INCOMING_CALL = "phone_incoming_call";
+
+  String ONGOING_CALL = "phone_ongoing_call";
+
+  String MISSED_CALL = "phone_missed_call";
+
+  String DEFAULT = "phone_default";
+}
diff --git a/java/com/android/dialer/notification/NotificationChannelManager.java b/java/com/android/dialer/notification/NotificationChannelManager.java
index 8867906..790aac3 100644
--- a/java/com/android/dialer/notification/NotificationChannelManager.java
+++ b/java/com/android/dialer/notification/NotificationChannelManager.java
@@ -17,366 +17,156 @@
 package com.android.dialer.notification;
 
 import android.annotation.TargetApi;
-import android.app.Notification;
 import android.app.NotificationChannel;
-import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
 import android.media.AudioAttributes;
-import android.net.Uri;
 import android.os.Build.VERSION_CODES;
-import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.StringDef;
 import android.support.v4.os.BuildCompat;
-import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
-import android.telephony.TelephonyManager;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
-import com.android.dialer.buildtype.BuildType;
+import android.util.ArraySet;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutors;
-import com.android.dialer.telecom.TelecomUtil;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.List;
-import java.util.Objects;
+import java.util.Set;
 
-/** Contains info on how to create {@link NotificationChannel NotificationChannels} */
-public class NotificationChannelManager {
-
-  private static final String PREFS_FILENAME = "NotificationChannelManager";
-  private static final String PREF_NEED_FIRST_INIT = "needFirstInit";
-  private static NotificationChannelManager instance;
-
-  public static NotificationChannelManager getInstance() {
-    if (instance == null) {
-      instance = new NotificationChannelManager();
-    }
-    return instance;
-  }
+/** Creates all notification channels for Dialer. */
+@TargetApi(VERSION_CODES.O)
+public final class NotificationChannelManager {
 
   /**
-   * Set the channel of notification appropriately. Will create the channel if it does not already
-   * exist. Safe to call pre-O (will no-op).
+   * Creates all the notification channels Dialer will need. This method is called at app startup
+   * and must be fast. Currently it takes between 3 to 7 milliseconds on a Pixel XL.
    *
-   * <p>phoneAccount should only be null if channelName is {@link Channel#DEFAULT} or {@link
-   * Channel#MISSED_CALL} since these do not have account-specific settings.
+   * <p>An alternative approach would be to lazily create channels when we actualy post a
+   * notification. The advatange to precreating channels is that:
+   *
+   * <ul>
+   *   <li>channels will be available to user right away. For example, users can customize voicemail
+   *       sounds when they first get their device without waiting for a voicemail to arrive first.
+   *   <li>code that posts a notification can be simpler
+   *   <li>channel management code is simpler and it's easier to ensure that the correct set of
+   *       channels are visible.
+   *       <ul>
    */
-  @TargetApi(26)
-  public static void applyChannel(
-      @NonNull Notification.Builder notification,
-      @NonNull Context context,
-      @Channel String channelName,
-      @Nullable PhoneAccountHandle phoneAccount) {
-    checkNullity(channelName, phoneAccount);
+  public static void initChannels(@NonNull Context context) {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isNotNull(context);
 
-    if (BuildCompat.isAtLeastO()) {
-      NotificationChannel channel =
-          NotificationChannelManager.getInstance().getChannel(context, channelName, phoneAccount);
-      notification.setChannelId(channel.getId());
-    }
-  }
-
-  private static void checkNullity(
-      @Channel String channelName, @Nullable PhoneAccountHandle phoneAccount) {
-    if (phoneAccount != null || channelAllowsNullPhoneAccountHandle(channelName)) {
-      return;
-    }
-
-    // TODO (b/36568553): don't throw an exception once most cases have been identified
-    IllegalArgumentException exception =
-        new IllegalArgumentException(
-            "Phone account handle must not be null on channel " + channelName);
-    if (BuildType.get() == BuildType.RELEASE) {
-      LogUtil.e("NotificationChannelManager.applyChannel", null, exception);
-    } else {
-      throw exception;
-    }
-  }
-
-  private static boolean channelAllowsNullPhoneAccountHandle(@Channel String channelName) {
-    switch (channelName) {
-      case Channel.DEFAULT:
-      case Channel.MISSED_CALL:
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  /** The base Channel IDs for {@link NotificationChannel} */
-  @Retention(RetentionPolicy.SOURCE)
-  @StringDef({
-    Channel.INCOMING_CALL,
-    Channel.ONGOING_CALL,
-    Channel.ONGOING_CALL_OLD,
-    Channel.MISSED_CALL,
-    Channel.VOICEMAIL,
-    Channel.EXTERNAL_CALL,
-    Channel.DEFAULT
-  })
-  public @interface Channel {
-    @Deprecated String ONGOING_CALL_OLD = "ongoingCall";
-    String INCOMING_CALL = "incomingCall";
-    String ONGOING_CALL = "ongoingCall2";
-    String MISSED_CALL = "missedCall";
-    String VOICEMAIL = "voicemail";
-    String EXTERNAL_CALL = "externalCall";
-    String DEFAULT = "default";
-  }
-
-  @Channel
-  private static final String[] prepopulatedAccountChannels =
-      new String[] {Channel.INCOMING_CALL, Channel.ONGOING_CALL, Channel.VOICEMAIL};
-
-  @Channel
-  private static final String[] prepopulatedGlobalChannels =
-      new String[] {Channel.MISSED_CALL, Channel.DEFAULT};
-
-  private NotificationChannelManager() {}
-
-  public void firstInitIfNeeded(@NonNull Context context) {
-    if (BuildCompat.isAtLeastO()) {
-      DialerExecutors.createNonUiTaskBuilder(this::firstInitIfNeededSync)
-          .build()
-          .executeSerial(context);
-    }
-  }
-
-  private boolean firstInitIfNeededSync(@NonNull Context context) {
-    if (needsFirstInit(context)) {
-      initChannels(context);
-      return true;
-    }
-    return false;
-  }
-
-  public boolean needsFirstInit(@NonNull Context context) {
-    return (BuildCompat.isAtLeastO()
-        && getSharedPreferences(context).getBoolean(PREF_NEED_FIRST_INIT, true));
-  }
-
-  @RequiresApi(VERSION_CODES.N)
-  private SharedPreferences getSharedPreferences(@NonNull Context context) {
-    // Use device protected storage since in some cases this will need to be accessed while device
-    // is locked
-    context = context.createDeviceProtectedStorageContext();
-    return context.getSharedPreferences(PREFS_FILENAME, Context.MODE_PRIVATE);
-  }
-
-  @RequiresApi(26)
-  public Intent getSettingsIntentForChannel(
-      @NonNull Context context, @Channel String channelName, PhoneAccountHandle accountHandle) {
-    checkNullity(channelName, accountHandle);
-    Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
-    intent.putExtra(
-        Settings.EXTRA_CHANNEL_ID, getChannel(context, channelName, accountHandle).getId());
-    intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());
-    return intent;
-  }
-
-  @TargetApi(26)
-  @SuppressWarnings("AndroidApiChecker")
-  public void initChannels(@NonNull Context context) {
-    if (!BuildCompat.isAtLeastO()) {
-      return;
-    }
-    LogUtil.enterBlock("NotificationChannelManager.initChannels");
-    List<PhoneAccountHandle> phoneAccounts = TelecomUtil.getCallCapablePhoneAccounts(context);
-
-    // Remove notification channels for PhoneAccounts that don't exist anymore
     NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-    List<NotificationChannelGroup> notificationChannelGroups =
-        notificationManager.getNotificationChannelGroups();
-    notificationChannelGroups
-        .stream()
-        .filter(group -> !idExists(group.getId(), phoneAccounts))
-        .forEach(group -> deleteGroup(notificationManager, group));
+    Set<String> desiredChannelIds = getAllDesiredChannelIds(context);
+    Set<String> existingChannelIds = getAllExistingChannelIds(context);
 
-    for (PhoneAccountHandle phoneAccountHandle : phoneAccounts) {
-      for (@Channel String channel : prepopulatedAccountChannels) {
-        getChannel(context, channel, phoneAccountHandle);
+    if (desiredChannelIds.equals(existingChannelIds)) {
+      return;
+    }
+    LogUtil.i(
+        "NotificationChannelManager.initChannels",
+        "doing an expensive initialization of all notification channels");
+    LogUtil.i(
+        "NotificationChannelManager.initChannels", "desired channel IDs: " + desiredChannelIds);
+    LogUtil.i(
+        "NotificationChannelManager.initChannels", "existing channel IDs: " + existingChannelIds);
+
+    // Delete any old channels that we don't use any more. This is safe because if we're recreate
+    // this later then any user settings will be restored. An example is SIM specific voicemail
+    // channel that gets deleted when the user removes the SIM and is then restored when the user
+    // re-inserts the SIM.
+    for (String existingChannelId : existingChannelIds) {
+      if (!desiredChannelIds.contains(existingChannelId)) {
+        notificationManager.deleteNotificationChannel(existingChannelId);
       }
     }
 
-    for (@Channel String channel : prepopulatedGlobalChannels) {
-      getChannel(context, channel, null);
-    }
-    getSharedPreferences(context).edit().putBoolean(PREF_NEED_FIRST_INIT, false).apply();
-  }
-
-  @TargetApi(26)
-  private void deleteGroup(
-      @NonNull NotificationManager notificationManager, @NonNull NotificationChannelGroup group) {
-    for (NotificationChannel channel : group.getChannels()) {
-      notificationManager.deleteNotificationChannel(channel.getId());
-    }
-    notificationManager.deleteNotificationChannelGroup(group.getId());
-  }
-
-  private boolean idExists(String id, List<PhoneAccountHandle> phoneAccountHandles) {
-    for (PhoneAccountHandle handle : phoneAccountHandles) {
-      if (Objects.equals(handle.getId(), id)) {
-        return true;
-      }
-    }
-    return false;
+    // Just recreate all desired channels. We won't do this often so it's ok to do this now.
+    createIncomingCallChannel(context);
+    createOngoingCallChannel(context);
+    createMissedCallChannel(context);
+    createDefaultChannel(context);
+    VoicemailChannelUtils.createAllChannels(context);
   }
 
   @NonNull
-  @RequiresApi(26)
-  private NotificationChannel getChannel(
-      @NonNull Context context,
-      @Channel String channelName,
-      @Nullable PhoneAccountHandle phoneAccount) {
-    String channelId = channelNameToId(channelName, phoneAccount);
-    NotificationChannel channel = getNotificationManager(context).getNotificationChannel(channelId);
-    if (channel == null) {
-      channel = createChannel(context, channelName, phoneAccount);
+  public static String getVoicemailChannelId(
+      @NonNull Context context, @Nullable PhoneAccountHandle handle) {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isNotNull(context);
+    return VoicemailChannelUtils.getChannelId(context, handle);
+  }
+
+  private static Set<String> getAllExistingChannelIds(@NonNull Context context) {
+    Set<String> result = new ArraySet<>();
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    for (NotificationChannel channel : notificationManager.getNotificationChannels()) {
+      result.add(channel.getId());
     }
-    return channel;
+    return result;
   }
 
-  private static String channelNameToId(
-      @Channel String name, @Nullable PhoneAccountHandle phoneAccountHandle) {
-    if (phoneAccountHandle == null) {
-      return name;
-    } else {
-      return name + ":" + phoneAccountHandle.getId();
-    }
+  private static Set<String> getAllDesiredChannelIds(@NonNull Context context) {
+    Set<String> result = new ArraySet<>();
+    result.add(NotificationChannelId.INCOMING_CALL);
+    result.add(NotificationChannelId.ONGOING_CALL);
+    result.add(NotificationChannelId.MISSED_CALL);
+    result.add(NotificationChannelId.DEFAULT);
+    result.addAll(VoicemailChannelUtils.getAllChannelIds(context));
+    return result;
   }
 
-  @RequiresApi(26)
-  private NotificationChannel createChannel(
-      Context context,
-      @Channel String channelName,
-      @Nullable PhoneAccountHandle phoneAccountHandle) {
-    String channelId = channelNameToId(channelName, phoneAccountHandle);
-
-    if (phoneAccountHandle != null) {
-      PhoneAccount account = getTelecomManager(context).getPhoneAccount(phoneAccountHandle);
-      NotificationChannelGroup group =
-          new NotificationChannelGroup(
-              phoneAccountHandle.getId(),
-              (account == null) ? phoneAccountHandle.getId() : account.getLabel().toString());
-      getNotificationManager(context)
-          .createNotificationChannelGroup(group); // No-op if already exists
-    } else if (!channelAllowsNullPhoneAccountHandle(channelName)) {
-      LogUtil.w(
-          "NotificationChannelManager.createChannel",
-          "Null PhoneAccountHandle with channel " + channelName);
-    }
-
-    Uri silentRingtone = Uri.EMPTY;
-
-    CharSequence name;
-    int importance;
-    boolean canShowBadge;
-    boolean lights;
-    boolean vibration;
-    Uri sound;
-    switch (channelName) {
-      case Channel.INCOMING_CALL:
-        name = context.getText(R.string.notification_channel_incoming_call);
-        importance = NotificationManager.IMPORTANCE_MAX;
-        canShowBadge = false;
-        lights = true;
-        vibration = false;
-        sound = silentRingtone;
-        break;
-      case Channel.MISSED_CALL:
-        name = context.getText(R.string.notification_channel_missed_call);
-        importance = NotificationManager.IMPORTANCE_DEFAULT;
-        canShowBadge = true;
-        lights = true;
-        vibration = true;
-        sound = silentRingtone;
-        break;
-      case Channel.ONGOING_CALL:
-        name = context.getText(R.string.notification_channel_ongoing_call);
-        importance = NotificationManager.IMPORTANCE_DEFAULT;
-        canShowBadge = false;
-        lights = false;
-        vibration = false;
-        sound = silentRingtone;
-        deleteOldOngoingCallChannelIfNeeded(context, phoneAccountHandle);
-        break;
-      case Channel.VOICEMAIL:
-        name = context.getText(R.string.notification_channel_voicemail);
-        importance = NotificationManager.IMPORTANCE_DEFAULT;
-        canShowBadge = true;
-        lights = true;
-        vibration =
-            TelephonyManagerCompat.isVoicemailVibrationEnabled(
-                getTelephonyManager(context), phoneAccountHandle);
-        sound =
-            TelephonyManagerCompat.getVoicemailRingtoneUri(
-                getTelephonyManager(context), phoneAccountHandle);
-        break;
-      case Channel.EXTERNAL_CALL:
-        name = context.getText(R.string.notification_channel_external_call);
-        importance = NotificationManager.IMPORTANCE_HIGH;
-        canShowBadge = false;
-        lights = true;
-        vibration = true;
-        sound = null;
-        break;
-      case Channel.DEFAULT:
-        name = context.getText(R.string.notification_channel_misc);
-        importance = NotificationManager.IMPORTANCE_DEFAULT;
-        canShowBadge = false;
-        lights = true;
-        vibration = true;
-        sound = null;
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown channel: " + channelName);
-    }
-
-    NotificationChannel channel = new NotificationChannel(channelId, name, importance);
-    channel.setShowBadge(canShowBadge);
-    if (sound != null) {
-      // silentRingtone acts as a sentinel value to indicate that setSound should still be called,
-      // but with a null value to indicate no sound.
-      channel.setSound(
-          sound.equals(silentRingtone) ? null : sound,
-          new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
-    }
-    channel.enableLights(lights);
-    channel.enableVibration(vibration);
-    getNotificationManager(context).createNotificationChannel(channel);
-    return channel;
+  private static void createIncomingCallChannel(@NonNull Context context) {
+    NotificationChannel channel =
+        new NotificationChannel(
+            NotificationChannelId.INCOMING_CALL,
+            context.getText(R.string.notification_channel_incoming_call),
+            NotificationManager.IMPORTANCE_MAX);
+    channel.setShowBadge(false);
+    channel.enableLights(true);
+    channel.enableVibration(false);
+    channel.setSound(
+        null, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
   }
 
-  @RequiresApi(26)
-  private void deleteOldOngoingCallChannelIfNeeded(
-      @NonNull Context context, PhoneAccountHandle phoneAccountHandle) {
-    String channelId = channelNameToId(Channel.ONGOING_CALL_OLD, phoneAccountHandle);
-    NotificationManager notificationManager = getNotificationManager(context);
-    NotificationChannel channel = notificationManager.getNotificationChannel(channelId);
-    if (channel != null) {
-      LogUtil.i(
-          "NotificationManager.deleteOldOngoingCallChannelIfNeeded",
-          "Old ongoing channel found. Deleting to create new channel");
-      notificationManager.deleteNotificationChannel(channel.getId());
-    }
+  private static void createOngoingCallChannel(@NonNull Context context) {
+    NotificationChannel channel =
+        new NotificationChannel(
+            NotificationChannelId.ONGOING_CALL,
+            context.getText(R.string.notification_channel_ongoing_call),
+            NotificationManager.IMPORTANCE_DEFAULT);
+    channel.setShowBadge(false);
+    channel.enableLights(false);
+    channel.enableVibration(false);
+    channel.setSound(
+        null, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
   }
 
-  private static NotificationManager getNotificationManager(@NonNull Context context) {
-    return context.getSystemService(NotificationManager.class);
+  private static void createMissedCallChannel(@NonNull Context context) {
+    NotificationChannel channel =
+        new NotificationChannel(
+            NotificationChannelId.MISSED_CALL,
+            context.getText(R.string.notification_channel_missed_call),
+            NotificationManager.IMPORTANCE_DEFAULT);
+    channel.setShowBadge(true);
+    channel.enableLights(true);
+    channel.enableVibration(true);
+    channel.setSound(
+        null, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
   }
 
-  private static TelephonyManager getTelephonyManager(@NonNull Context context) {
-    return context.getSystemService(TelephonyManager.class);
+  private static void createDefaultChannel(@NonNull Context context) {
+    NotificationChannel channel =
+        new NotificationChannel(
+            NotificationChannelId.DEFAULT,
+            context.getText(R.string.notification_channel_misc),
+            NotificationManager.IMPORTANCE_DEFAULT);
+    channel.setShowBadge(false);
+    channel.enableLights(true);
+    channel.enableVibration(true);
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
   }
 
-  private static TelecomManager getTelecomManager(@NonNull Context context) {
-    return context.getSystemService(TelecomManager.class);
-  }
+  private NotificationChannelManager() {}
 }
diff --git a/java/com/android/dialer/notification/PackageUpdatedReceiver.java b/java/com/android/dialer/notification/PackageUpdatedReceiver.java
deleted file mode 100644
index feed402..0000000
--- a/java/com/android/dialer/notification/PackageUpdatedReceiver.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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
- */
-
-package com.android.dialer.notification;
-
-import android.annotation.TargetApi;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.support.v4.os.BuildCompat;
-
-/** Inits the notification channels when Dialer or OS is updated */
-public class PackageUpdatedReceiver extends BroadcastReceiver {
-
-  @Override
-  @TargetApi(26)
-  public void onReceive(Context context, Intent intent) {
-    if (!BuildCompat.isAtLeastO()) {
-      return;
-    }
-    context = context.createDeviceProtectedStorageContext();
-    NotificationChannelManager.getInstance().initChannels(context);
-  }
-}
diff --git a/java/com/android/dialer/notification/VoicemailChannelUtils.java b/java/com/android/dialer/notification/VoicemailChannelUtils.java
new file mode 100644
index 0000000..dc74799
--- /dev/null
+++ b/java/com/android/dialer/notification/VoicemailChannelUtils.java
@@ -0,0 +1,217 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.notification;
+
+import android.annotation.TargetApi;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.os.Build.VERSION_CODES;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/** Utilities for working with voicemail channels. */
+@TargetApi(VERSION_CODES.O)
+/* package */ final class VoicemailChannelUtils {
+  private static final String GLOBAL_VOICEMAIL_CHANNEL_ID = "phone_voicemail";
+  private static final String PER_ACCOUNT_VOICEMAIL_CHANNEL_ID_PREFIX = "phone_voicemail_account_";
+
+  static Set<String> getAllChannelIds(@NonNull Context context) {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isNotNull(context);
+
+    Set<String> result = new ArraySet<>();
+    if (isSingleSimDevice(context)) {
+      result.add(GLOBAL_VOICEMAIL_CHANNEL_ID);
+    } else {
+      for (PhoneAccountHandle handle : getAllEligableAccounts(context)) {
+        result.add(getChannelIdForAccount(handle));
+      }
+    }
+    return result;
+  }
+
+  static void createAllChannels(@NonNull Context context) {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isNotNull(context);
+
+    if (isSingleSimDevice(context)) {
+      createGlobalVoicemailChannel(context);
+    } else {
+      for (PhoneAccountHandle handle : getAllEligableAccounts(context)) {
+        createVoicemailChannelForAccount(context, handle);
+      }
+    }
+  }
+
+  @NonNull
+  static String getChannelId(@NonNull Context context, @Nullable PhoneAccountHandle handle) {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isNotNull(context);
+
+    // Most devices we deal with have a single SIM slot. No need to distinguish between phone
+    // accounts.
+    if (isSingleSimDevice(context)) {
+      return GLOBAL_VOICEMAIL_CHANNEL_ID;
+    }
+
+    // We can get a null phone account at random points (modem reboot, etc...). Gracefully degrade
+    // by using the default channel.
+    if (handle == null) {
+      LogUtil.i(
+          "VoicemailChannelUtils.getChannelId",
+          "no phone account on a multi-SIM device, using default channel");
+      return NotificationChannelId.DEFAULT;
+    }
+
+    // Voicemail notifications should always be associated with a SIM based phone account.
+    if (!isChannelAllowedForAccount(context, handle)) {
+      LogUtil.i(
+          "VoicemailChannelUtils.getChannelId",
+          "phone account is not for a SIM, using default channel");
+      return NotificationChannelId.DEFAULT;
+    }
+
+    // Now we're in the multi-SIM case.
+    String channelId = getChannelIdForAccount(handle);
+    if (!doesChannelExist(context, channelId)) {
+      LogUtil.i(
+          "VoicemailChannelUtils.getChannelId",
+          "voicemail channel not found for phone account (possible SIM swap?), creating a new one");
+      createVoicemailChannelForAccount(context, handle);
+    }
+    return channelId;
+  }
+
+  private static boolean doesChannelExist(@NonNull Context context, @NonNull String channelId) {
+    return context.getSystemService(NotificationManager.class).getNotificationChannel(channelId)
+        != null;
+  }
+
+  private static String getChannelIdForAccount(@NonNull PhoneAccountHandle handle) {
+    Assert.isNotNull(handle);
+    return PER_ACCOUNT_VOICEMAIL_CHANNEL_ID_PREFIX + ":" + handle.getId();
+  }
+
+  /**
+   * Creates a voicemail channel but doesn't associate it with a SIM. For devices with only one SIM
+   * slot this is ideal because there won't be duplication in the settings UI.
+   */
+  private static void createGlobalVoicemailChannel(@NonNull Context context) {
+    NotificationChannel channel = newChannel(context, GLOBAL_VOICEMAIL_CHANNEL_ID, null);
+
+    TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+    PhoneAccountHandle handle =
+        telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+    if (handle == null) {
+      LogUtil.i(
+          "VoicemailChannelUtils.createGlobalVoicemailChannel",
+          "phone account is null, not migrating sound settings");
+    } else if (!isChannelAllowedForAccount(context, handle)) {
+      LogUtil.i(
+          "VoicemailChannelUtils.createGlobalVoicemailChannel",
+          "phone account is not eligable, not migrating sound settings");
+    } else {
+      migrateVoicemailSoundSettings(context, channel, handle);
+    }
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
+  }
+
+  private static List<PhoneAccountHandle> getAllEligableAccounts(@NonNull Context context) {
+    List<PhoneAccountHandle> handles = new ArrayList<>();
+    TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+    for (PhoneAccountHandle handle : telecomManager.getCallCapablePhoneAccounts()) {
+      if (isChannelAllowedForAccount(context, handle)) {
+        handles.add(handle);
+      }
+    }
+    return handles;
+  }
+
+  private static void createVoicemailChannelForAccount(
+      @NonNull Context context, @NonNull PhoneAccountHandle handle) {
+    PhoneAccount phoneAccount =
+        context.getSystemService(TelecomManager.class).getPhoneAccount(handle);
+    NotificationChannel channel =
+        newChannel(context, getChannelIdForAccount(handle), phoneAccount.getLabel());
+    migrateVoicemailSoundSettings(context, channel, handle);
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
+  }
+
+  private static void migrateVoicemailSoundSettings(
+      @NonNull Context context,
+      @NonNull NotificationChannel channel,
+      @NonNull PhoneAccountHandle handle) {
+    TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+    channel.enableVibration(telephonyManager.isVoicemailVibrationEnabled(handle));
+    channel.setSound(
+        telephonyManager.getVoicemailRingtoneUri(handle),
+        new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+  }
+
+  private static boolean isChannelAllowedForAccount(
+      @NonNull Context context, @NonNull PhoneAccountHandle handle) {
+    PhoneAccount phoneAccount =
+        context.getSystemService(TelecomManager.class).getPhoneAccount(handle);
+    if (phoneAccount == null) {
+      return false;
+    }
+    if (!phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+      return false;
+    }
+    return true;
+  }
+
+  private static NotificationChannel newChannel(
+      @NonNull Context context, @NonNull String channelId, @Nullable CharSequence nameSuffix) {
+    CharSequence name = context.getText(R.string.notification_channel_voicemail);
+    // TODO: Use a string resource template after v10.
+    if (!TextUtils.isEmpty(nameSuffix)) {
+      name = TextUtils.concat(name, ": ", nameSuffix);
+    }
+
+    NotificationChannel channel =
+        new NotificationChannel(channelId, name, NotificationManager.IMPORTANCE_DEFAULT);
+    channel.setShowBadge(true);
+    channel.enableLights(true);
+    channel.enableVibration(true);
+    channel.setSound(
+        Settings.System.DEFAULT_NOTIFICATION_URI,
+        new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+    return channel;
+  }
+
+  private static boolean isSingleSimDevice(@NonNull Context context) {
+    return context.getSystemService(TelephonyManager.class).getPhoneCount() <= 1;
+  }
+
+  private VoicemailChannelUtils() {}
+}
diff --git a/java/com/android/dialer/notification/res/values-af/strings.xml b/java/com/android/dialer/notification/res/values-af/strings.xml
index 08dd754..e48249b 100644
--- a/java/com/android/dialer/notification/res/values-af/strings.xml
+++ b/java/com/android/dialer/notification/res/values-af/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Deurlopende oproepe"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Gemiste oproepe"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Stemboodskappe"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Ekterne oproepe"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Verstek"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-am/strings.xml b/java/com/android/dialer/notification/res/values-am/strings.xml
index 56d6c2c..0983e05 100644
--- a/java/com/android/dialer/notification/res/values-am/strings.xml
+++ b/java/com/android/dialer/notification/res/values-am/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"በመካሄድ ላይ ያሉ ጥሪዎች"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"ያመለጡ ጥሪዎች"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"የድምፅ መልዕክቶች"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ውጫዊ ጥሪዎች"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ነባሪ"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ar/strings.xml b/java/com/android/dialer/notification/res/values-ar/strings.xml
index 71857c2..ab6059f 100644
--- a/java/com/android/dialer/notification/res/values-ar/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ar/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"المكالمات الجارية"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"المكالمات الفائتة"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"رسائل البريد الصوتي"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"المكالمات الخارجية"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"افتراضي"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-az/strings.xml b/java/com/android/dialer/notification/res/values-az/strings.xml
index f907e55..425f30a 100644
--- a/java/com/android/dialer/notification/res/values-az/strings.xml
+++ b/java/com/android/dialer/notification/res/values-az/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Gedən zənglər"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Buraxılmış zənglər"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Səsli məktublar"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"External calls"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Defolt"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
index 4d5b5e7..4598e76 100644
--- a/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pozivi u toku"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Propušteni pozivi"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Govorne poruke"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Spoljni pozivi"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Podrazumevano"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-be/strings.xml b/java/com/android/dialer/notification/res/values-be/strings.xml
index 70defe3..586a36c 100644
--- a/java/com/android/dialer/notification/res/values-be/strings.xml
+++ b/java/com/android/dialer/notification/res/values-be/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Адбываючыяся выклікі"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Прапушчаныя выклікі"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Галасавая пошта"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Знешнія выклікі"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Стандартны"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-bg/strings.xml b/java/com/android/dialer/notification/res/values-bg/strings.xml
index 1ec202e..9bc8f8f 100644
--- a/java/com/android/dialer/notification/res/values-bg/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bg/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Текущи обаждания"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропуснати обаждания"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Гласови съобщения"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Външни обаждания"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"По подразбиране"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-bn/strings.xml b/java/com/android/dialer/notification/res/values-bn/strings.xml
index 886f831..1d77817 100644
--- a/java/com/android/dialer/notification/res/values-bn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bn/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"সংযুক্ত কল"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"মিস করা কল"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ভয়েসমেল"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"বাহ্যিক কল"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ডিফল্ট"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-bs/strings.xml b/java/com/android/dialer/notification/res/values-bs/strings.xml
index e408a64..dedbb1c 100644
--- a/java/com/android/dialer/notification/res/values-bs/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bs/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Tekući pozivi"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Propušteni pozivi"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Poruke govorne pošte"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Vanjski pozivi"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Zadano"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ca/strings.xml b/java/com/android/dialer/notification/res/values-ca/strings.xml
index ea81b62..1c19d0f 100644
--- a/java/com/android/dialer/notification/res/values-ca/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ca/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Trucades en curs"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Trucades perdudes"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Missatges de veu"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Trucades externes"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminat"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-cs/strings.xml b/java/com/android/dialer/notification/res/values-cs/strings.xml
index 9ea7b61..c428ca2 100644
--- a/java/com/android/dialer/notification/res/values-cs/strings.xml
+++ b/java/com/android/dialer/notification/res/values-cs/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Probíhající hovory"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Zmeškané hovory"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Hlasové zprávy"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Externí hovory"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Výchozí"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-da/strings.xml b/java/com/android/dialer/notification/res/values-da/strings.xml
index e4fc4dd..7f0ce9f 100644
--- a/java/com/android/dialer/notification/res/values-da/strings.xml
+++ b/java/com/android/dialer/notification/res/values-da/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Igangværende opkald"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Ubesvarede opkald"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talebeskeder"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Eksterne opkald"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-de/strings.xml b/java/com/android/dialer/notification/res/values-de/strings.xml
index 7fce6bf..86b7520 100644
--- a/java/com/android/dialer/notification/res/values-de/strings.xml
+++ b/java/com/android/dialer/notification/res/values-de/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Laufende Anrufe"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Entgangene Anrufe"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mailboxnachrichten"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Externe Anrufe"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-el/strings.xml b/java/com/android/dialer/notification/res/values-el/strings.xml
index a25bb43..812dc25 100644
--- a/java/com/android/dialer/notification/res/values-el/strings.xml
+++ b/java/com/android/dialer/notification/res/values-el/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Κλήσεις σε εξέλιξη"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Αναπάντητες κλήσεις"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Μηνύματα αυτόματου τηλεφωνητή"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Εξωτερικές κλήσεις"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Προεπιλογή"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-en-rAU/strings.xml b/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
index 7d4bd82..43b722b 100644
--- a/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ongoing calls"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missed calls"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemail"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"External calls"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-en-rGB/strings.xml b/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
index 7d4bd82..43b722b 100644
--- a/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ongoing calls"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missed calls"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemail"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"External calls"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-en-rIN/strings.xml b/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
index 7d4bd82..43b722b 100644
--- a/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ongoing calls"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missed calls"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemail"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"External calls"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-es-rUS/strings.xml b/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
index fe8fe13..c56edcf 100644
--- a/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Llamadas en curso"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Llamadas perdidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mensajes de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Llamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminado"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-es/strings.xml b/java/com/android/dialer/notification/res/values-es/strings.xml
index fe8fe13..c56edcf 100644
--- a/java/com/android/dialer/notification/res/values-es/strings.xml
+++ b/java/com/android/dialer/notification/res/values-es/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Llamadas en curso"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Llamadas perdidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mensajes de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Llamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminado"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-et/strings.xml b/java/com/android/dialer/notification/res/values-et/strings.xml
index 4162395..9c60a31 100644
--- a/java/com/android/dialer/notification/res/values-et/strings.xml
+++ b/java/com/android/dialer/notification/res/values-et/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Käimasolevad kõned"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Vastamata kõned"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Kõnepostisõnumid"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Välised kõned"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Vaikeseade"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-eu/strings.xml b/java/com/android/dialer/notification/res/values-eu/strings.xml
index 326ac0a..d94ac0a 100644
--- a/java/com/android/dialer/notification/res/values-eu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-eu/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Abian diren deiak"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Dei galduak"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ahots-mezuak"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Kanpoko deiak"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Lehenetsia"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fa/strings.xml b/java/com/android/dialer/notification/res/values-fa/strings.xml
index f1a7efc..edbc983 100644
--- a/java/com/android/dialer/notification/res/values-fa/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fa/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"تماس‌های درحال انجام"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"تماس‌های بی‌پاسخ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"پست‌های صوتی"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"تماس‌های خارجی"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"پیش‌فرض"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fi/strings.xml b/java/com/android/dialer/notification/res/values-fi/strings.xml
index c88c232..87652f8 100644
--- a/java/com/android/dialer/notification/res/values-fi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fi/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Käynnissä olevat puhelut"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Vastaamattomat puhelut"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Vastaajaviestit"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Ulkopuoliset puhelut"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Oletus"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml b/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
index a21d6b2..5a2d7dc 100644
--- a/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Appels en cours"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Appels manqués"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Messages vocaux"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Appels externes"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Par défaut"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fr/strings.xml b/java/com/android/dialer/notification/res/values-fr/strings.xml
index a21d6b2..5a2d7dc 100644
--- a/java/com/android/dialer/notification/res/values-fr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fr/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Appels en cours"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Appels manqués"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Messages vocaux"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Appels externes"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Par défaut"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-gl/strings.xml b/java/com/android/dialer/notification/res/values-gl/strings.xml
index 3b57a59..0e7fb61 100644
--- a/java/com/android/dialer/notification/res/values-gl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-gl/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas saíntes"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas perdidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Correos de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Chamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminado"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-gu/strings.xml b/java/com/android/dialer/notification/res/values-gu/strings.xml
index f185e59..a4a0a7a 100644
--- a/java/com/android/dialer/notification/res/values-gu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-gu/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ચાલુ કૉલ"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"છૂટેલા કૉલ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"વૉઇસમેઇલ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"બાહ્ય કૉલ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ડિફૉલ્ટ"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hi/strings.xml b/java/com/android/dialer/notification/res/values-hi/strings.xml
index 89c8e55..69ed9b0 100644
--- a/java/com/android/dialer/notification/res/values-hi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hi/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"चल रहे कॉल"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"छूटे कॉल"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"वॉइसमेल"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"बाहरी कॉल"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"डिफ़ॉल्ट"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hr/strings.xml b/java/com/android/dialer/notification/res/values-hr/strings.xml
index 9f786d7..a5924c3 100644
--- a/java/com/android/dialer/notification/res/values-hr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hr/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pozivi u tijeku"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Propušteni pozivi"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Poruke govorne pošte"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Vanjski pozivi"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Zadano"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hu/strings.xml b/java/com/android/dialer/notification/res/values-hu/strings.xml
index 09fa795..719252f 100644
--- a/java/com/android/dialer/notification/res/values-hu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hu/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Kimenő hívások"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Nem fogadott hívások"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Hangüzenetek"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Külső hívások"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Alapértelmezett"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hy/strings.xml b/java/com/android/dialer/notification/res/values-hy/strings.xml
index 693898a..6bb2c34 100644
--- a/java/com/android/dialer/notification/res/values-hy/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hy/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ընթացիկ զանգեր"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Բաց թողնված զանգեր"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ձայնային փոստ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Արտաքին զանգեր"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Կանխադրված"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-in/strings.xml b/java/com/android/dialer/notification/res/values-in/strings.xml
index 405b292..88ef3d5 100644
--- a/java/com/android/dialer/notification/res/values-in/strings.xml
+++ b/java/com/android/dialer/notification/res/values-in/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Panggilan keluar"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Panggilan tak terjawab"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Pesan suara"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Panggilan eksternal"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-is/strings.xml b/java/com/android/dialer/notification/res/values-is/strings.xml
index be84917..166d974 100644
--- a/java/com/android/dialer/notification/res/values-is/strings.xml
+++ b/java/com/android/dialer/notification/res/values-is/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Símtöl í gangi"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Ósvöruð símtöl"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talhólfsskilaboð"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Utanaðkomandi símtöl"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Sjálfgefið"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-it/strings.xml b/java/com/android/dialer/notification/res/values-it/strings.xml
index 1ac6e2d..7b55da9 100644
--- a/java/com/android/dialer/notification/res/values-it/strings.xml
+++ b/java/com/android/dialer/notification/res/values-it/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chiamate in uscita"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chiamate perse"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Messaggi vocali"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Chiamate esterne"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predefinito"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-iw/strings.xml b/java/com/android/dialer/notification/res/values-iw/strings.xml
index ed07b86..2b8b9df 100644
--- a/java/com/android/dialer/notification/res/values-iw/strings.xml
+++ b/java/com/android/dialer/notification/res/values-iw/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"שיחות יוצאות"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"שיחות שלא נענו"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"הודעות קוליות"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"שיחות חיצוניות"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ברירת מחדל"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ja/strings.xml b/java/com/android/dialer/notification/res/values-ja/strings.xml
index 3265d72..2ff8da7 100644
--- a/java/com/android/dialer/notification/res/values-ja/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ja/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"通話中"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"不在着信"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ボイスメール"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"外部通話"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"デフォルト"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ka/strings.xml b/java/com/android/dialer/notification/res/values-ka/strings.xml
index 6d81465..73394ef 100644
--- a/java/com/android/dialer/notification/res/values-ka/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ka/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"გამავალი ზარები"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"გამოტოვებული ზარები"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ხმოვანი ფოსტა"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"გარე ზარები"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ნაგულისხმევი"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-kk/strings.xml b/java/com/android/dialer/notification/res/values-kk/strings.xml
index 35733fb..8151c9c 100644
--- a/java/com/android/dialer/notification/res/values-kk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-kk/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Қазіргі қоңыраулар"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Қабылданбаған қоңыраулар"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Дауыстық хабарлар"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Сыртқы қоңыраулар"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Әдепкі"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-km/strings.xml b/java/com/android/dialer/notification/res/values-km/strings.xml
index 42bc113..22131ff 100644
--- a/java/com/android/dialer/notification/res/values-km/strings.xml
+++ b/java/com/android/dialer/notification/res/values-km/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ការ​ហៅ​បន្ត"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"ការ​ហៅ​ដែល​មិន​បាន​ទទួល"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"សារ​ជា​សំឡេង"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ការ​ហៅខាង​ក្រៅ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"លំ​នាំ​ដើម"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-kn/strings.xml b/java/com/android/dialer/notification/res/values-kn/strings.xml
index 45f26e3..d6e55bd 100644
--- a/java/com/android/dialer/notification/res/values-kn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-kn/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗಳು"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"ಮಿಸ್ಡ್‌ ಕರೆಗಳು"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ಧ್ವನಿಮೇಲ್‌ಗಳು"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ಹೊರಗಿನ ಕರೆಗಳು"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ಡಿಫಾಲ್ಟ್"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ko/strings.xml b/java/com/android/dialer/notification/res/values-ko/strings.xml
index d806cad..5a66717 100644
--- a/java/com/android/dialer/notification/res/values-ko/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ko/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"진행 중인 전화"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"부재중 전화"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"음성사서함"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"외부 전화"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"기본"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ky/strings.xml b/java/com/android/dialer/notification/res/values-ky/strings.xml
index eb6adf6..c525931 100644
--- a/java/com/android/dialer/notification/res/values-ky/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ky/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Учурдагы чалуулар"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Кабыл алынбаган чалуулар"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Үнкаттар"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Тышкы чалуулар"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Демейки"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-lo/strings.xml b/java/com/android/dialer/notification/res/values-lo/strings.xml
index f439807..a52d9df 100644
--- a/java/com/android/dialer/notification/res/values-lo/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lo/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ສາຍໂທອອກ"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"ສາຍບໍ່ໄດ້ຮັບ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ສາຍພາຍນອກ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ຄ່າເລີ່ມຕົ້ນ"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-lt/strings.xml b/java/com/android/dialer/notification/res/values-lt/strings.xml
index f08697a..6f26d3e 100644
--- a/java/com/android/dialer/notification/res/values-lt/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lt/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Vykstantys skambučiai"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Praleisti skambučiai"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Balso pašto pranešimai"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Išoriniai skambučiai"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Numatytasis"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-lv/strings.xml b/java/com/android/dialer/notification/res/values-lv/strings.xml
index d465b68..1819d81 100644
--- a/java/com/android/dialer/notification/res/values-lv/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lv/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Aktīvie zvani"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Neatbildētie zvani"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Balss pasta ziņojumi"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Ārējie zvani"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Noklusējums"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-mk/strings.xml b/java/com/android/dialer/notification/res/values-mk/strings.xml
index 838065b..56459c4 100644
--- a/java/com/android/dialer/notification/res/values-mk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mk/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Појдовни повици"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропуштени повици"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Говорни пораки"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Надворешни повици"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Стандардно"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ml/strings.xml b/java/com/android/dialer/notification/res/values-ml/strings.xml
index 448186a..49a64e8 100644
--- a/java/com/android/dialer/notification/res/values-ml/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ml/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"നിലവിലുള്ള കോളുകൾ"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"മിസ്‌ഡ് കോളുകൾ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"വോയ്‌സ്മെയിലുകൾ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"എക്‌സ്റ്റേണൽ കോളുകൾ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ഡിഫോൾട്ട്"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-mn/strings.xml b/java/com/android/dialer/notification/res/values-mn/strings.xml
index 3dca52e..28297b3 100644
--- a/java/com/android/dialer/notification/res/values-mn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mn/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Үргэлжилж буй дуудлага"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Аваагүй дуудлага"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Дуут шуудан"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Гадаад дуудлага"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Өгөгдмөл"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-mr/strings.xml b/java/com/android/dialer/notification/res/values-mr/strings.xml
index 5685376..38fbd60 100644
--- a/java/com/android/dialer/notification/res/values-mr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mr/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"सुरू असलेले कॉल"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"सुटलेले कॉल"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"व्हॉइसमेल"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"बाह्य कॉल"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"डीफॉल्ट"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ms/strings.xml b/java/com/android/dialer/notification/res/values-ms/strings.xml
index a1961c4..ec7be04 100644
--- a/java/com/android/dialer/notification/res/values-ms/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ms/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Panggilan sedang berlangsung"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Panggilan terlepas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mel suara"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Panggilan luar"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Lalai"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-my/strings.xml b/java/com/android/dialer/notification/res/values-my/strings.xml
index 26398b4..44df847 100644
--- a/java/com/android/dialer/notification/res/values-my/strings.xml
+++ b/java/com/android/dialer/notification/res/values-my/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"လက်ရှိခေါ်ဆိုမှုများ"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"လွဲသွားသော ခေါ်ဆိုမှုများ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"အသံစာပို့စနစ်များ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ပြင်ပခေါ်ဆိုမှုများ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"မူရင်း"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-nb/strings.xml b/java/com/android/dialer/notification/res/values-nb/strings.xml
index e4ccd48..8e63fd2 100644
--- a/java/com/android/dialer/notification/res/values-nb/strings.xml
+++ b/java/com/android/dialer/notification/res/values-nb/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pågående samtaler"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Tapte anrop"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talepost"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Eksterne anrop"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ne/strings.xml b/java/com/android/dialer/notification/res/values-ne/strings.xml
index 8ccd299..e653bb3 100644
--- a/java/com/android/dialer/notification/res/values-ne/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ne/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"जारी रहेका कलहरू"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"छुटेका कलहरू"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"भ्वाइस मेलहरू"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"बाह्य कलहरू"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"पूर्वनिर्धारित मान"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-nl/strings.xml b/java/com/android/dialer/notification/res/values-nl/strings.xml
index e46dd19..094cc35 100644
--- a/java/com/android/dialer/notification/res/values-nl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-nl/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Actieve oproepen"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Gemiste oproepen"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemails"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Externe oproepen"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standaard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-no/strings.xml b/java/com/android/dialer/notification/res/values-no/strings.xml
index e4ccd48..8e63fd2 100644
--- a/java/com/android/dialer/notification/res/values-no/strings.xml
+++ b/java/com/android/dialer/notification/res/values-no/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pågående samtaler"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Tapte anrop"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talepost"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Eksterne anrop"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pa/strings.xml b/java/com/android/dialer/notification/res/values-pa/strings.xml
index 40709c1..c4ee97b 100644
--- a/java/com/android/dialer/notification/res/values-pa/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pa/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"ਖੁੰਝੀਆਂ ਕਾਲਾਂ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ਵੌਇਸਮੇਲਾਂ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ਬਾਹਰੀ ਕਾਲਾਂ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pl/strings.xml b/java/com/android/dialer/notification/res/values-pl/strings.xml
index 73b795c..4b33460 100644
--- a/java/com/android/dialer/notification/res/values-pl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pl/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Połączenia trwające"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Połączenia nieodebrane"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Wiadomości głosowe"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Połączenia zewnętrzne"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Domyślny"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml b/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
index f6e41cb..4b988c3 100644
--- a/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas em andamento"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas perdidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Correios de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Chamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Padrão"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml b/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
index ec42a5b..45b31eb 100644
--- a/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas efetuadas"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas não atendidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mensagens de correio de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Chamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predefinição"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pt/strings.xml b/java/com/android/dialer/notification/res/values-pt/strings.xml
index f6e41cb..4b988c3 100644
--- a/java/com/android/dialer/notification/res/values-pt/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas em andamento"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas perdidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Correios de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Chamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Padrão"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ro/strings.xml b/java/com/android/dialer/notification/res/values-ro/strings.xml
index 7deeabb..040c58a 100644
--- a/java/com/android/dialer/notification/res/values-ro/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ro/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Apeluri în desfășurare"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Apeluri nepreluate"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mesaje vocale"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Apeluri externe"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Prestabilit"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ru/strings.xml b/java/com/android/dialer/notification/res/values-ru/strings.xml
index 3a11404..a811799 100644
--- a/java/com/android/dialer/notification/res/values-ru/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ru/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Текущие вызовы"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропущенные вызовы"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Голосовые сообщения"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Внешние вызовы"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"По умолчанию"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-si/strings.xml b/java/com/android/dialer/notification/res/values-si/strings.xml
index bf0a5a7..3ad0af7 100644
--- a/java/com/android/dialer/notification/res/values-si/strings.xml
+++ b/java/com/android/dialer/notification/res/values-si/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"යන ඇමතුම්"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"මඟ හැරුණු ඇමතුම්"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"හඬ තැපැල්"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"බාහිර ඇමතුම්"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"පෙරනිමි"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sk/strings.xml b/java/com/android/dialer/notification/res/values-sk/strings.xml
index 4a67e60..30941bc 100644
--- a/java/com/android/dialer/notification/res/values-sk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sk/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Prebiehajúce hovory"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Zmeškané hovory"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Hlasové správy"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Externé hovory"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predvolené"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sl/strings.xml b/java/com/android/dialer/notification/res/values-sl/strings.xml
index e54111d..70474b8 100644
--- a/java/com/android/dialer/notification/res/values-sl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sl/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Aktivni klici"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Neodgovorjeni klici"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Sporočila v odzivniku"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Zunanji klici"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Privzeto"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sq/strings.xml b/java/com/android/dialer/notification/res/values-sq/strings.xml
index 42d4daa..03bc247 100644
--- a/java/com/android/dialer/notification/res/values-sq/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sq/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Telefonatat në vazhdim"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Telefonatat e humbura"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Postat zanore"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Telefonatat e jashtme"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"I parazgjedhur"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sr/strings.xml b/java/com/android/dialer/notification/res/values-sr/strings.xml
index 1047717..8326c04 100644
--- a/java/com/android/dialer/notification/res/values-sr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sr/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Позиви у току"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропуштени позиви"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Говорне поруке"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Спољни позиви"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Подразумевано"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sv/strings.xml b/java/com/android/dialer/notification/res/values-sv/strings.xml
index 6c9ff83..e3170d4 100644
--- a/java/com/android/dialer/notification/res/values-sv/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sv/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pågående samtal"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missade samtal"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Röstmeddelanden"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Externa samtal"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sw/strings.xml b/java/com/android/dialer/notification/res/values-sw/strings.xml
index a493f88..d0a65b0 100644
--- a/java/com/android/dialer/notification/res/values-sw/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sw/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Simu zinazoendelea"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Simu ambazo hukujibu"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ujumbe wa sauti"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Simu za nje"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Chaguo-msingi"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ta/strings.xml b/java/com/android/dialer/notification/res/values-ta/strings.xml
index d3000cf..8a6ae89 100644
--- a/java/com/android/dialer/notification/res/values-ta/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ta/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"செயலில் உள்ள அழைப்புகள்"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"தவறிய அழைப்புகள்"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"குரலஞ்சல்கள்"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"வெளி அழைப்புகள்"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"இயல்பு"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-te/strings.xml b/java/com/android/dialer/notification/res/values-te/strings.xml
index b14b210..b1911d3 100644
--- a/java/com/android/dialer/notification/res/values-te/strings.xml
+++ b/java/com/android/dialer/notification/res/values-te/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"కొనసాగుతున్న కాల్‌లు"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"సమాధానమివ్వని కాల్‌లు"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"వాయిస్ మెయిల్‌లు"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"బాహ్య కాల్‌లు"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"డిఫాల్ట్"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-th/strings.xml b/java/com/android/dialer/notification/res/values-th/strings.xml
index 45248bb..b2949e4 100644
--- a/java/com/android/dialer/notification/res/values-th/strings.xml
+++ b/java/com/android/dialer/notification/res/values-th/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"สายที่สนทนาอยู่"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"สายที่ไม่ได้รับ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ข้อความเสียง"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"สายนอก"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ค่าเริ่มต้น"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-tl/strings.xml b/java/com/android/dialer/notification/res/values-tl/strings.xml
index 3e88a05..1219ad8 100644
--- a/java/com/android/dialer/notification/res/values-tl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-tl/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Mga kasalukuyang tawag"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Mga hindi nasagot na tawag"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mga voicemail"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Mga external na tawag"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-tr/strings.xml b/java/com/android/dialer/notification/res/values-tr/strings.xml
index d4e063b..71c91c8 100644
--- a/java/com/android/dialer/notification/res/values-tr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-tr/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Devam eden çağrılar"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Cevapsız çağrılar"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Sesli mesajlar"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Harici çağrılar"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Varsayılan"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-uk/strings.xml b/java/com/android/dialer/notification/res/values-uk/strings.xml
index a83a584..a002f42 100644
--- a/java/com/android/dialer/notification/res/values-uk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-uk/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Поточні виклики"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропущені виклики"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Голосова пошта"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Зовнішні виклики"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"За умовчанням"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ur/strings.xml b/java/com/android/dialer/notification/res/values-ur/strings.xml
index ba6e0d1..805fe08 100644
--- a/java/com/android/dialer/notification/res/values-ur/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ur/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"جاری کالیں"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"چھوٹی ہوئی کالیں"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"صوتی میلز"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"بیرونی کالیں"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ڈیفالٹ"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-uz/strings.xml b/java/com/android/dialer/notification/res/values-uz/strings.xml
index d45ff47..16075b0 100644
--- a/java/com/android/dialer/notification/res/values-uz/strings.xml
+++ b/java/com/android/dialer/notification/res/values-uz/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Davom etayotgan suhbatlar"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Javobsiz chaqiruvlar"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ovozli xabarlar"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Tashqi chaqiruvlar"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standart"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-vi/strings.xml b/java/com/android/dialer/notification/res/values-vi/strings.xml
index 6df8872..b6ab3d2 100644
--- a/java/com/android/dialer/notification/res/values-vi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-vi/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Cuộc gọi đến"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Cuộc gọi nhỡ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Thư thoại"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Cuộc gọi bên ngoài"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Mặc định"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml b/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
index fa5f0a6..1ef46c2 100644
--- a/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"正在进行的通话"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"未接电话"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"语音邮件"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"外部来电"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"默认"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml b/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
index 307a7f9..43a6fab 100644
--- a/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"進行中的通話"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"未接來電"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"留言信箱"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"外部通話"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"預設"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml b/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
index 054a2d7..35236be 100644
--- a/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"進行中的通話"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"未接來電"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"語音留言"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"外部通話"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"預設"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zu/strings.xml b/java/com/android/dialer/notification/res/values-zu/strings.xml
index 744ffc8..f3d9553 100644
--- a/java/com/android/dialer/notification/res/values-zu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zu/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Amakholi aqhubekayo"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Amakholi akuphuthile"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Amavoyisimeyili"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Amakholi angaphandle"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Okuzenzakalelayo"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values/strings.xml b/java/com/android/dialer/notification/res/values/strings.xml
index cb3119f..a3c6935 100644
--- a/java/com/android/dialer/notification/res/values/strings.xml
+++ b/java/com/android/dialer/notification/res/values/strings.xml
@@ -20,7 +20,6 @@
   <string name="notification_channel_ongoing_call">Ongoing calls</string>
   <string name="notification_channel_missed_call">Missed calls</string>
   <string name="notification_channel_voicemail">Voicemails</string>
-  <string name="notification_channel_external_call">External calls</string>
   <!-- [CHAR LIMIT=NONE] Catch-all channel for notifications that don't fit into one of the others -->
   <string name="notification_channel_misc">Default</string>
 </resources>
diff --git a/java/com/android/dialer/oem/CequintCallerIdManager.java b/java/com/android/dialer/oem/CequintCallerIdManager.java
index 806d553..86097c4 100644
--- a/java/com/android/dialer/oem/CequintCallerIdManager.java
+++ b/java/com/android/dialer/oem/CequintCallerIdManager.java
@@ -28,8 +28,8 @@
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
diff --git a/java/com/android/dialer/oem/MotorolaUtils.java b/java/com/android/dialer/oem/MotorolaUtils.java
index 2c91e60..ffab8ea 100644
--- a/java/com/android/dialer/oem/MotorolaUtils.java
+++ b/java/com/android/dialer/oem/MotorolaUtils.java
@@ -18,9 +18,9 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.telephony.TelephonyManager;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.PackageUtils;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
diff --git a/java/com/android/dialer/p13n/inference/P13nRanking.java b/java/com/android/dialer/p13n/inference/P13nRanking.java
index 0682e85..79b4d71 100644
--- a/java/com/android/dialer/p13n/inference/P13nRanking.java
+++ b/java/com/android/dialer/p13n/inference/P13nRanking.java
@@ -22,7 +22,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.p13n.inference.protocol.P13nRanker;
 import com.android.dialer.p13n.inference.protocol.P13nRankerFactory;
 import java.util.List;
diff --git a/java/com/android/dialer/performancereport/PerformanceReport.java b/java/com/android/dialer/performancereport/PerformanceReport.java
new file mode 100644
index 0000000..27fd748
--- /dev/null
+++ b/java/com/android/dialer/performancereport/PerformanceReport.java
@@ -0,0 +1,155 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.performancereport;
+
+import android.os.SystemClock;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.widget.AbsListView;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.UiAction;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/** Tracks UI performance for a call. */
+public final class PerformanceReport {
+
+  private static final long INVALID_TIME = -1;
+  private static final long ACTIVE_DURATION = TimeUnit.MINUTES.toMillis(5);
+
+  private static final List<UiAction.Type> actions = new ArrayList<>();
+  private static final List<Long> actionTimestamps = new ArrayList<>();
+
+  private static final RecyclerView.OnScrollListener recordOnScrollListener =
+      new RecyclerView.OnScrollListener() {
+        @Override
+        public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+          if (newState == RecyclerView.SCROLL_STATE_SETTLING) {
+            PerformanceReport.recordClick(UiAction.Type.SCROLL);
+          }
+          super.onScrollStateChanged(recyclerView, newState);
+        }
+      };
+
+  private static boolean recording = false;
+  private static long appLaunchTimeMillis = INVALID_TIME;
+  private static long firstClickTimeMillis = INVALID_TIME;
+  private static long lastActionTimeMillis = INVALID_TIME;
+
+  @Nullable private static UiAction.Type ignoreActionOnce = null;
+
+  private PerformanceReport() {}
+
+  public static void startRecording() {
+    LogUtil.enterBlock("PerformanceReport.startRecording");
+
+    appLaunchTimeMillis = SystemClock.elapsedRealtime();
+    lastActionTimeMillis = appLaunchTimeMillis;
+    if (!actions.isEmpty()) {
+      actions.clear();
+      actionTimestamps.clear();
+    }
+    recording = true;
+  }
+
+  public static void stopRecording() {
+    LogUtil.enterBlock("PerformanceReport.stopRecording");
+    recording = false;
+  }
+
+  public static void recordClick(UiAction.Type action) {
+    if (!recording) {
+      return;
+    }
+
+    if (action == ignoreActionOnce) {
+      LogUtil.i("PerformanceReport.recordClick", "%s is ignored", action.toString());
+      ignoreActionOnce = null;
+      return;
+    }
+    ignoreActionOnce = null;
+
+    LogUtil.v("PerformanceReport.recordClick", action.toString());
+
+    // Timeout
+    long currentTime = SystemClock.elapsedRealtime();
+    if (currentTime - lastActionTimeMillis > ACTIVE_DURATION) {
+      startRecording();
+      recordClick(action);
+      return;
+    }
+
+    lastActionTimeMillis = currentTime;
+    if (actions.isEmpty()) {
+      firstClickTimeMillis = currentTime;
+    }
+    actions.add(action);
+    actionTimestamps.add(currentTime - appLaunchTimeMillis);
+  }
+
+  public static void recordScrollStateChange(int scrollState) {
+    if (scrollState == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
+      recordClick(UiAction.Type.SCROLL);
+    }
+  }
+
+  public static void logOnScrollStateChange(RecyclerView recyclerView) {
+    // Remove the listener in case it was added before
+    recyclerView.removeOnScrollListener(recordOnScrollListener);
+    recyclerView.addOnScrollListener(recordOnScrollListener);
+  }
+
+  public static boolean isRecording() {
+    return recording;
+  }
+
+  public static long getTimeSinceAppLaunch() {
+    if (appLaunchTimeMillis == INVALID_TIME) {
+      return INVALID_TIME;
+    }
+    return SystemClock.elapsedRealtime() - appLaunchTimeMillis;
+  }
+
+  public static long getTimeSinceFirstClick() {
+    if (firstClickTimeMillis == INVALID_TIME) {
+      return INVALID_TIME;
+    }
+    return SystemClock.elapsedRealtime() - firstClickTimeMillis;
+  }
+
+  public static List<UiAction.Type> getActions() {
+    return actions;
+  }
+
+  public static List<Long> getActionTimestamps() {
+    return actionTimestamps;
+  }
+
+  @Nullable
+  public static UiAction.Type getIgnoreActionOnce() {
+    return ignoreActionOnce;
+  }
+
+  public static void setIgnoreActionOnce(@Nullable UiAction.Type ignoreActionOnce) {
+    PerformanceReport.ignoreActionOnce = ignoreActionOnce;
+    LogUtil.i(
+        "PerformanceReport.setIgnoreActionOnce",
+        "next action will be ignored once if it is %s",
+        ignoreActionOnce.toString());
+  }
+}
diff --git a/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java b/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
index 2aed9e7..c398251 100644
--- a/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
+++ b/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
@@ -49,6 +49,8 @@
 
   boolean canReportAsInvalid(ContactSource.Type sourceType, String objectId);
 
+  boolean reportAsInvalid(Context context, CachedContactInfo cachedContactInfo);
+
   /** @return return {@link Uri} to the photo or return {@code null} when failing to add photo */
   @Nullable
   Uri addPhoto(Context context, String number, InputStream in);
diff --git a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
index c9e940e..4fa3147 100644
--- a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
+++ b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
@@ -203,6 +203,7 @@
     return info;
   }
 
+  @Nullable
   public ContactInfo lookupNumber(String number, String countryIso) {
     return lookupNumber(number, countryIso, -1);
   }
@@ -223,12 +224,14 @@
   @SuppressWarnings("ReferenceEquality")
   public ContactInfo lookupNumber(String number, String countryIso, long directoryId) {
     if (TextUtils.isEmpty(number)) {
+      LogUtil.d("ContactInfoHelper.lookupNumber", "number is empty");
       return null;
     }
 
     ContactInfo info;
 
     if (PhoneNumberHelper.isUriNumber(number)) {
+      LogUtil.d("ContactInfoHelper.lookupNumber", "number is sip");
       // The number is a SIP address..
       info = lookupContactFromUri(getContactInfoLookupUri(number, directoryId));
       if (info == null || info == ContactInfo.EMPTY) {
@@ -246,6 +249,7 @@
     final ContactInfo updatedInfo;
     if (info == null) {
       // The lookup failed.
+      LogUtil.d("ContactInfoHelper.lookupNumber", "lookup failed");
       updatedInfo = null;
     } else {
       // If we did not find a matching contact, generate an empty contact info for the number.
@@ -325,9 +329,11 @@
    */
   ContactInfo lookupContactFromUri(Uri uri) {
     if (uri == null) {
+      LogUtil.d("ContactInfoHelper.lookupContactFromUri", "uri is null");
       return null;
     }
     if (!PermissionsUtil.hasContactsReadPermissions(mContext)) {
+      LogUtil.d("ContactInfoHelper.lookupContactFromUri", "no contact permission, return empty");
       return ContactInfo.EMPTY;
     }
 
@@ -336,10 +342,12 @@
       String[] projection = PhoneQuery.getPhoneLookupProjection(uri);
       phoneLookupCursor = mContext.getContentResolver().query(uri, projection, null, null, null);
     } catch (NullPointerException e) {
+      LogUtil.e("ContactInfoHelper.lookupContactFromUri", "phone lookup", e);
       // Trap NPE from pre-N CP2
       return null;
     }
     if (phoneLookupCursor == null) {
+      LogUtil.d("ContactInfoHelper.lookupContactFromUri", "phoneLookupCursor is null");
       return null;
     }
 
@@ -408,19 +416,32 @@
   private ContactInfo queryContactInfoForPhoneNumber(
       String number, String countryIso, long directoryId) {
     if (TextUtils.isEmpty(number)) {
+      LogUtil.d("ContactInfoHelper.queryContactInfoForPhoneNumber", "number is empty");
       return null;
     }
 
     ContactInfo info = lookupContactFromUri(getContactInfoLookupUri(number, directoryId));
+    if (info == null) {
+      LogUtil.d("ContactInfoHelper.queryContactInfoForPhoneNumber", "info looked up is null");
+    }
     if (info != null && info != ContactInfo.EMPTY) {
       info.formattedNumber = formatPhoneNumber(number, null, countryIso);
+      if (directoryId == -1) {
+        // Contact found in the default directory
+        info.sourceType = ContactSource.Type.SOURCE_TYPE_DIRECTORY;
+      } else {
+        // Contact found in the extended directory specified by directoryId
+        info.sourceType = ContactSource.Type.SOURCE_TYPE_EXTENDED;
+      }
     } else if (mCachedNumberLookupService != null) {
       CachedContactInfo cacheInfo =
           mCachedNumberLookupService.lookupCachedContactFromNumber(mContext, number);
       if (cacheInfo != null) {
-        info = cacheInfo.getContactInfo().isBadData ? null : cacheInfo.getContactInfo();
-      } else {
-        info = null;
+        if (!cacheInfo.getContactInfo().isBadData) {
+          info = cacheInfo.getContactInfo();
+        } else {
+          LogUtil.i("ContactInfoHelper.queryContactInfoForPhoneNumber", "info is bad data");
+        }
       }
     }
     return info;
diff --git a/java/com/android/dialer/phonenumberproto/Converter.java b/java/com/android/dialer/phonenumberproto/Converter.java
new file mode 100644
index 0000000..453b988
--- /dev/null
+++ b/java/com/android/dialer/phonenumberproto/Converter.java
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+package com.android.dialer.phonenumberproto;
+
+import com.android.dialer.DialerInternalPhoneNumber;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+
+/**
+ * Methods for converting from {@link PhoneNumber} POJOs to {@link DialerInternalPhoneNumber} protos
+ * and back.
+ */
+class Converter {
+
+  static DialerInternalPhoneNumber pojoToProto(PhoneNumber pojo) {
+    DialerInternalPhoneNumber.Builder proto = DialerInternalPhoneNumber.newBuilder();
+    if (pojo.hasCountryCode()) {
+      proto.setCountryCode(pojo.getCountryCode());
+    }
+    if (pojo.hasCountryCodeSource()) {
+      switch (pojo.getCountryCodeSource()) {
+        case FROM_NUMBER_WITH_PLUS_SIGN:
+          proto.setCountryCodeSource(
+              DialerInternalPhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN);
+          break;
+        case FROM_NUMBER_WITH_IDD:
+          proto.setCountryCodeSource(
+              DialerInternalPhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_IDD);
+          break;
+        case FROM_NUMBER_WITHOUT_PLUS_SIGN:
+          proto.setCountryCodeSource(
+              DialerInternalPhoneNumber.CountryCodeSource.FROM_NUMBER_WITHOUT_PLUS_SIGN);
+          break;
+        case FROM_DEFAULT_COUNTRY:
+          proto.setCountryCodeSource(
+              DialerInternalPhoneNumber.CountryCodeSource.FROM_DEFAULT_COUNTRY);
+          break;
+        default:
+          throw new IllegalArgumentException(
+              "unsupported country code source: " + pojo.getCountryCodeSource());
+      }
+    }
+    if (pojo.hasExtension()) {
+      proto.setExtension(pojo.getExtension());
+    }
+    if (pojo.hasItalianLeadingZero()) {
+      proto.setItalianLeadingZero(pojo.isItalianLeadingZero());
+    }
+    if (pojo.hasNationalNumber()) {
+      proto.setNationalNumber(pojo.getNationalNumber());
+    }
+    if (pojo.hasNumberOfLeadingZeros()) {
+      proto.setNumberOfLeadingZeros(pojo.getNumberOfLeadingZeros());
+    }
+    if (pojo.hasPreferredDomesticCarrierCode()) {
+      proto.setPreferredDomesticCarrierCode(pojo.getPreferredDomesticCarrierCode());
+    }
+    if (pojo.hasRawInput()) {
+      proto.setRawInput(pojo.getRawInput());
+    }
+    return proto.build();
+  }
+
+  static PhoneNumber protoToPojo(DialerInternalPhoneNumber proto) {
+    PhoneNumber pojo = new PhoneNumber();
+    if (proto.hasCountryCode()) {
+      pojo.setCountryCode(proto.getCountryCode());
+    }
+    if (proto.hasCountryCodeSource()) {
+      switch (proto.getCountryCodeSource()) {
+        case FROM_NUMBER_WITH_PLUS_SIGN:
+          pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN);
+          break;
+        case FROM_NUMBER_WITH_IDD:
+          pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_IDD);
+          break;
+        case FROM_NUMBER_WITHOUT_PLUS_SIGN:
+          pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_NUMBER_WITHOUT_PLUS_SIGN);
+          break;
+        case FROM_DEFAULT_COUNTRY:
+          pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_DEFAULT_COUNTRY);
+          break;
+        default:
+          throw new IllegalArgumentException(
+              "unsupported country code source: " + proto.getCountryCodeSource());
+      }
+    }
+    if (proto.hasExtension()) {
+      pojo.setExtension(proto.getExtension());
+    }
+    if (proto.hasItalianLeadingZero()) {
+      pojo.setItalianLeadingZero(proto.getItalianLeadingZero());
+    }
+    if (proto.hasNationalNumber()) {
+      pojo.setNationalNumber(proto.getNationalNumber());
+    }
+    if (proto.hasNumberOfLeadingZeros()) {
+      pojo.setNumberOfLeadingZeros(proto.getNumberOfLeadingZeros());
+    }
+    if (proto.hasPreferredDomesticCarrierCode()) {
+      pojo.setPreferredDomesticCarrierCode(proto.getPreferredDomesticCarrierCode());
+    }
+    if (proto.hasRawInput()) {
+      pojo.setRawInput(proto.getRawInput());
+    }
+    return pojo;
+  }
+}
diff --git a/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
new file mode 100644
index 0000000..cc509f4
--- /dev/null
+++ b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+package com.android.dialer.phonenumberproto;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
+import com.android.dialer.DialerInternalPhoneNumber;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.DialerPhoneNumber.RawInput;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType;
+
+/**
+ * Wrapper for selected methods in {@link PhoneNumberUtil} which uses the {@link DialerPhoneNumber}
+ * lite proto instead of the {@link com.google.i18n.phonenumbers.Phonenumber.PhoneNumber} POJO.
+ *
+ * <p>All methods should be called on a worker thread.
+ */
+public class DialerPhoneNumberUtil {
+  private final PhoneNumberUtil phoneNumberUtil;
+
+  @WorkerThread
+  public DialerPhoneNumberUtil(@NonNull PhoneNumberUtil phoneNumberUtil) {
+    Assert.isWorkerThread();
+    this.phoneNumberUtil = Assert.isNotNull(phoneNumberUtil);
+  }
+
+  /**
+   * Parses the provided raw phone number into a {@link DialerPhoneNumber}.
+   *
+   * @see PhoneNumberUtil#parse(String, String)
+   */
+  @WorkerThread
+  public DialerPhoneNumber parse(@Nullable String numberToParse, @Nullable String defaultRegion) {
+    Assert.isWorkerThread();
+
+    DialerPhoneNumber.Builder dialerPhoneNumber = DialerPhoneNumber.newBuilder();
+    RawInput.Builder rawInput = RawInput.newBuilder();
+    // Numbers can be null or empty for incoming "unknown" calls.
+    if (numberToParse != null) {
+      rawInput.setNumber(numberToParse);
+    }
+    if (defaultRegion != null) {
+      rawInput.setCountryIso(defaultRegion);
+    }
+    dialerPhoneNumber.setRawInput(rawInput.build());
+
+    try {
+      dialerPhoneNumber.setDialerInternalPhoneNumber(
+          Converter.pojoToProto(phoneNumberUtil.parse(numberToParse, defaultRegion)));
+    } catch (NumberParseException e) {
+      LogUtil.w("DialerPhoneNumberUtil.parse", "couldn't parse phone number", e);
+    }
+    return dialerPhoneNumber.build();
+  }
+
+  /**
+   * Returns true if the two numbers were parseable by libphonenumber and are an {@link
+   * MatchType#EXACT_MATCH} or if they have the same raw input.
+   */
+  @WorkerThread
+  public boolean isExactMatch(
+      @NonNull DialerPhoneNumber firstNumberIn, @NonNull DialerPhoneNumber secondNumberIn) {
+    Assert.isWorkerThread();
+    if (!Assert.isNotNull(firstNumberIn).hasDialerInternalPhoneNumber()
+        || !Assert.isNotNull(secondNumberIn).hasDialerInternalPhoneNumber()) {
+      return firstNumberIn.getRawInput().equals(secondNumberIn.getRawInput());
+    }
+    return isNumberMatch(
+            firstNumberIn.getDialerInternalPhoneNumber(),
+            secondNumberIn.getDialerInternalPhoneNumber())
+        == MatchType.EXACT_MATCH;
+  }
+
+  /**
+   * Compares the provided phone numbers.
+   *
+   * @see PhoneNumberUtil#isNumberMatch(com.google.i18n.phonenumbers.Phonenumber.PhoneNumber,
+   *     com.google.i18n.phonenumbers.Phonenumber.PhoneNumber)
+   */
+  @WorkerThread
+  private MatchType isNumberMatch(
+      @NonNull DialerInternalPhoneNumber firstNumberIn,
+      @NonNull DialerInternalPhoneNumber secondNumberIn) {
+    Assert.isWorkerThread();
+    return phoneNumberUtil.isNumberMatch(
+        Converter.protoToPojo(Assert.isNotNull(firstNumberIn)),
+        Converter.protoToPojo(Assert.isNotNull(secondNumberIn)));
+  }
+}
diff --git a/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto b/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto
new file mode 100644
index 0000000..a0f3626
--- /dev/null
+++ b/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto
@@ -0,0 +1,172 @@
+// 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
+
+syntax = "proto2";
+
+option java_package = "com.android.dialer";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+package com.android.dialer;
+
+// A phone number for use in the dialer application. It consists of a
+// DialerInternalPhoneNumber, which is a copy of libphonenumber's PhoneNumber
+// proto, and the raw input used to create it.
+message DialerPhoneNumber {
+  // libphonenumber representation of the phone number. May be empty if the raw
+  // input failed to parse, in which case raw_input should be used.
+  optional DialerInternalPhoneNumber dialer_internal_phone_number = 1;
+
+  // The raw input which was used to create a DialerPhoneNumber.
+  message RawInput {
+    // The phone number as it was entered or received.
+    optional string number = 1;
+    // The ISO 3166-1 two letter country code of the country where the user made
+    // or received the call.
+    optional string country_iso = 2;
+  }
+  // Prefer to use dialer_internal_phone_number if present.
+  optional RawInput raw_input = 2;
+}
+
+// This is a copy of libphonenumber proto file for use in the dialer codebase.
+// We cannot depend on the real libphonenumber proto because it is not exposed
+// in any open source library. As such, this file could fall out of sync with
+// that proto over time.
+//
+// The only difference between this proto and the libphonenumber proto (as of
+// when this file was created) is the package name and proto name.
+//
+// If the libphonenumber proto becomes accessible some day, it may be possible
+// to remove this proto and use the real libphonenumber proto assuming this
+// proto is kept wire-compatible with it.
+message DialerInternalPhoneNumber {
+  // The country calling code for this number, as defined by the International
+  // Telecommunication Union (ITU). For example, this would be 1 for NANPA
+  // countries, and 33 for France.
+  required int32 country_code = 1;
+
+  // The National (significant) Number, as defined in International
+  // Telecommunication Union (ITU) Recommendation E.164, without any leading
+  // zero. The leading-zero is stored separately if required, since this is an
+  // uint64 and hence cannot store such information. Do not use this field
+  // directly: if you want the national significant number, call the
+  // getNationalSignificantNumber method of PhoneNumberUtil.
+  //
+  // For countries which have the concept of an "area code" or "national
+  // destination code", this is included in the National (significant) Number.
+  // Although the ITU says the maximum length should be 15, we have found longer
+  // numbers in some countries e.g. Germany.
+  // Note that the National (significant) Number does not contain the National
+  // (trunk) prefix. Obviously, as a uint64, it will never contain any
+  // formatting (hyphens, spaces, parentheses), nor any alphanumeric spellings.
+  required uint64 national_number = 2 [jstype = JS_NUMBER];
+
+  // Extension is not standardized in ITU recommendations, except for being
+  // defined as a series of numbers with a maximum length of 40 digits. It is
+  // defined as a string here to accommodate for the possible use of a leading
+  // zero in the extension (organizations have complete freedom to do so, as
+  // there is no standard defined). Other than digits, some other dialling
+  // characters such as "," (indicating a wait) may be stored here.
+  optional string extension = 3;
+
+  // In some countries, the national (significant) number starts with one or
+  // more "0"s without this being a national prefix or trunk code of some kind.
+  // For example, the leading zero in the national (significant) number of an
+  // Italian phone number indicates the number is a fixed-line number.  There
+  // have been plans to migrate fixed-line numbers to start with the digit two
+  // since December 2000, but it has not happened yet. See
+  // http://en.wikipedia.org/wiki/%2B39 for more details.
+  //
+  // These fields can be safely ignored (there is no need to set them) for most
+  // countries. Some limited number of countries behave like Italy - for these
+  // cases, if the leading zero(s) of a number would be retained even when
+  // dialling internationally, set this flag to true, and also set the number of
+  // leading zeros.
+  //
+  // Clients who use the parsing or conversion functionality of the i18n phone
+  // number libraries (go/phonenumbers) will have these fields set if necessary
+  // automatically.
+  optional bool italian_leading_zero = 4;
+  optional int32 number_of_leading_zeros = 8 [default = 1];
+
+  // The next few fields are non-essential fields for a phone number. They
+  // retain extra information about the form the phone number was in when it was
+  // provided to us to parse. They can be safely ignored by most clients. To
+  // populate them, call parseAndKeepRawInput on PhoneNumberUtil.
+
+  // This field is used to store the raw input string containing phone numbers
+  // before it was canonicalized by the library. For example, it could be used
+  // to store alphanumerical numbers such as "1-800-GOOG-411".
+  optional string raw_input = 5;
+
+  // The source from which the country_code is derived. This is not set in the
+  // general parsing method, but in the method that parses and keeps raw_input.
+  // New fields could be added upon request.
+  enum CountryCodeSource {
+    // The country_code is derived based on a phone number with a leading "+",
+    // e.g. the French number "+33 1 42 68 53 00".
+    FROM_NUMBER_WITH_PLUS_SIGN = 1;
+
+    // The country_code is derived based on a phone number with a leading IDD,
+    // e.g. the French number "011 33 1 42 68 53 00", as it is dialled from US.
+    FROM_NUMBER_WITH_IDD = 5;
+
+    // The country_code is derived based on a phone number without a leading
+    // "+", e.g. the French number "33 1 42 68 53 00" when defaultCountry is
+    // supplied as France.
+    FROM_NUMBER_WITHOUT_PLUS_SIGN = 10;
+
+    // The country_code is derived NOT based on the phone number itself, but
+    // from the defaultCountry parameter provided in the parsing function by the
+    // clients. This happens mostly for numbers written in the national format
+    // (without country code). For example, this would be set when parsing the
+    // French number "01 42 68 53 00", when defaultCountry is supplied as
+    // France.
+    FROM_DEFAULT_COUNTRY = 20;
+  }
+
+  // The source from which the country_code is derived.
+  optional CountryCodeSource country_code_source = 6;
+
+  // The carrier selection code that is preferred when calling this phone number
+  // domestically. This also includes codes that need to be dialed in some
+  // countries when calling from landlines to mobiles or vice versa. For
+  // example, in Columbia, a "3" needs to be dialed before the phone number
+  // itself when calling from a mobile phone to a domestic landline phone and
+  // vice versa.
+  //
+  // Note this is the "preferred" code, which means other codes may work as
+  // well.
+  optional string preferred_domestic_carrier_code = 7;
+}
+
+// Examples:
+//
+// Google MTV, +1 650-253-0000, (650) 253-0000
+// country_code: 1
+// national_number: 6502530000
+//
+// Google Paris, +33 (0)1 42 68 53 00, 01 42 68 53 00
+// country_code: 33
+// national_number: 142685300
+//
+// Google Beijing, +86-10-62503000, (010) 62503000
+// country_code: 86
+// national_number: 1062503000
+//
+// Google Italy, +39 02-36618 300, 02-36618 300
+// country_code: 39
+// national_number: 236618300
+// italian_leading_zero: true
\ No newline at end of file
diff --git a/java/com/android/dialer/postcall/PostCall.java b/java/com/android/dialer/postcall/PostCall.java
index 7eb83b1..b17a9b6 100644
--- a/java/com/android/dialer/postcall/PostCall.java
+++ b/java/com/android/dialer/postcall/PostCall.java
@@ -26,22 +26,23 @@
 import android.telephony.TelephonyManager;
 import android.view.View;
 import android.view.View.OnClickListener;
-import com.android.dialer.common.ConfigProvider;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProvider;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
 
 /** Helper class to handle all post call actions. */
 public class PostCall {
 
-  private static final String KEY_POST_CALL_CALL_CONNECT_TIME = "post_call_call_connect_time";
   private static final String KEY_POST_CALL_CALL_DISCONNECT_TIME = "post_call_call_disconnect_time";
+  private static final String KEY_POST_CALL_CALL_CONNECT_TIME = "post_call_call_connect_time";
   private static final String KEY_POST_CALL_CALL_NUMBER = "post_call_call_number";
   private static final String KEY_POST_CALL_MESSAGE_SENT = "post_call_message_sent";
 
@@ -53,6 +54,8 @@
         promptUserToViewSentMessage(activity, rootView);
       } else if (shouldPromptUserToSendMessage(activity)) {
         promptUserToSendMessage(activity, rootView);
+      } else {
+        clear(activity);
       }
     }
   }
@@ -158,6 +161,19 @@
         .apply();
   }
 
+  /**
+   * Restart performance recording if there is a recent call (disconnect time to now is under
+   * threshold)
+   */
+  public static void restartPerformanceRecordingIfARecentCallExist(Context context) {
+    long disconnectTimeMillis =
+        DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
+            .getLong(PostCall.KEY_POST_CALL_CALL_DISCONNECT_TIME, -1);
+    if (disconnectTimeMillis != -1 && PerformanceReport.isRecording()) {
+      PerformanceReport.startRecording();
+    }
+  }
+
   private static void clear(Context context) {
     activeSnackbar = null;
 
diff --git a/java/com/android/dialer/searchfragment/NewSearchFragment.java b/java/com/android/dialer/searchfragment/NewSearchFragment.java
deleted file mode 100644
index e7283d0..0000000
--- a/java/com/android/dialer/searchfragment/NewSearchFragment.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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
- */
-
-package com.android.dialer.searchfragment;
-
-import android.app.Fragment;
-import android.app.LoaderManager.LoaderCallbacks;
-import android.content.Loader;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-/** Fragment used for searching contacts. */
-public final class NewSearchFragment extends Fragment implements LoaderCallbacks<Cursor> {
-
-  private RecyclerView recyclerView;
-  private SearchAdapter adapter;
-  private String query;
-
-  @Nullable
-  @Override
-  public View onCreateView(
-      LayoutInflater inflater, @Nullable ViewGroup parent, @Nullable Bundle bundle) {
-    getLoaderManager().initLoader(0, null, this);
-    View view = inflater.inflate(R.layout.fragment_search, parent, false);
-    recyclerView = view.findViewById(R.id.recycler_view);
-    recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-    getLoaderManager().initLoader(0, null, this);
-    return view;
-  }
-
-  @Override
-  public Loader<Cursor> onCreateLoader(int id, Bundle bundle) {
-    // TODO add more loaders
-    return new SearchContactsCursorLoader(getContext());
-  }
-
-  @Override
-  public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
-    if (adapter == null) {
-      adapter = new SearchAdapter(getContext());
-    }
-    if (loader instanceof SearchContactsCursorLoader) {
-      adapter.setContactsCursor(new SearchContactCursor(cursor, query));
-    }
-    recyclerView.setAdapter(adapter);
-  }
-
-  @Override
-  public void onLoaderReset(Loader<Cursor> loader) {
-    if (adapter != null) {
-      adapter.clear();
-      adapter = null;
-    }
-    recyclerView.setAdapter(null);
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-    if (adapter != null) {
-      adapter.setQuery(query);
-    }
-  }
-}
diff --git a/java/com/android/dialer/searchfragment/QueryUtil.java b/java/com/android/dialer/searchfragment/QueryUtil.java
deleted file mode 100644
index a3f44ab..0000000
--- a/java/com/android/dialer/searchfragment/QueryUtil.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * 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
- */
-
-package com.android.dialer.searchfragment;
-
-import android.graphics.Typeface;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.telephony.PhoneNumberUtils;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.StyleSpan;
-import java.util.regex.Pattern;
-
-/** Contains utility methods for comparing and filtering strings with search queries. */
-final class QueryUtil {
-
-  /** Matches strings with "-", "(", ")", 2-9 of at least length one. */
-  static final Pattern T9_PATTERN = Pattern.compile("[\\-()2-9]+");
-
-  /**
-   * Compares a name and query and returns a {@link CharSequence} with bolded characters.
-   *
-   * <p>Some example:
-   *
-   * <ul>
-   *   <li>"query" would bold "John [query] Smith"
-   *   <li>"222" would bold "[AAA] Mom"
-   *   <li>"222" would bold "[A]llen [A]lex [A]aron"
-   * </ul>
-   *
-   * @param query containing any characters
-   * @param name of a contact/string that query will compare to
-   * @return name with query bolded if query can be found in the name.
-   */
-  static CharSequence getNameWithQueryBolded(@Nullable String query, @NonNull String name) {
-    if (TextUtils.isEmpty(query)) {
-      return name;
-    }
-
-    int index = -1;
-    int numberOfBoldedCharacters = 0;
-
-    if (nameMatchesT9Query(query, name)) {
-      // Bold the characters that match the t9 query
-      index = indexOfQueryNonDigitsIgnored(query, getT9Representation(name));
-      if (index == -1) {
-        return getNameWithInitialsBolded(query, name);
-      }
-      numberOfBoldedCharacters = query.length();
-
-      for (int i = 0; i < query.length(); i++) {
-        char c = query.charAt(i);
-        if (!Character.isDigit(c)) {
-          numberOfBoldedCharacters--;
-        }
-      }
-
-      for (int i = 0; i < index + numberOfBoldedCharacters; i++) {
-        if (!Character.isLetterOrDigit(name.charAt(i))) {
-          if (i < index) {
-            index++;
-          } else {
-            numberOfBoldedCharacters++;
-          }
-        }
-      }
-    }
-
-    if (index == -1) {
-      // Bold the query as an exact match in the name
-      index = name.toLowerCase().indexOf(query);
-      numberOfBoldedCharacters = query.length();
-    }
-
-    return index == -1 ? name : getBoldedString(name, index, numberOfBoldedCharacters);
-  }
-
-  private static CharSequence getNameWithInitialsBolded(String query, String name) {
-    SpannableString boldedInitials = new SpannableString(name);
-    name = name.toLowerCase();
-    int initialsBolded = 0;
-    int nameIndex = -1;
-
-    while (++nameIndex < name.length() && initialsBolded < query.length()) {
-      if ((nameIndex == 0 || name.charAt(nameIndex - 1) == ' ')
-          && getDigit(name.charAt(nameIndex)) == query.charAt(initialsBolded)) {
-        boldedInitials.setSpan(
-            new StyleSpan(Typeface.BOLD),
-            nameIndex,
-            nameIndex + 1,
-            Spanned.SPAN_INCLUSIVE_INCLUSIVE);
-        initialsBolded++;
-      }
-    }
-    return boldedInitials;
-  }
-
-  /**
-   * Compares a number and a query and returns a {@link CharSequence} with bolded characters.
-   *
-   * <ul>
-   *   <li>"123" would bold "(650)34[1-23]24"
-   *   <li>"123" would bold "+1([123])111-2222
-   * </ul>
-   *
-   * @param query containing only numbers and phone number related characters "(", ")", "-", "+"
-   * @param number phone number of a contact that the query will compare to.
-   * @return number with query bolded if query can be found in the number.
-   */
-  static CharSequence getNumberWithQueryBolded(@Nullable String query, @NonNull String number) {
-    if (TextUtils.isEmpty(query) || !numberMatchesNumberQuery(query, number)) {
-      return number;
-    }
-
-    int index = indexOfQueryNonDigitsIgnored(query, number);
-    int boldedCharacters = query.length();
-
-    for (char c : query.toCharArray()) {
-      if (!Character.isDigit(c)) {
-        boldedCharacters--;
-      }
-    }
-
-    for (int i = 0; i < index + boldedCharacters; i++) {
-      if (!Character.isDigit(number.charAt(i))) {
-        if (i <= index) {
-          index++;
-        } else {
-          boldedCharacters++;
-        }
-      }
-    }
-    return getBoldedString(number, index, boldedCharacters);
-  }
-
-  private static SpannableString getBoldedString(String s, int index, int numBolded) {
-    SpannableString span = new SpannableString(s);
-    span.setSpan(
-        new StyleSpan(Typeface.BOLD), index, index + numBolded, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-    return span;
-  }
-
-  /**
-   * @return true if the query is of T9 format and the name's T9 representation belongs to the
-   *     query; false otherwise.
-   */
-  static boolean nameMatchesT9Query(String query, String name) {
-    if (!T9_PATTERN.matcher(query).matches()) {
-      return false;
-    }
-
-    // Substring
-    if (indexOfQueryNonDigitsIgnored(query, getT9Representation(name)) != -1) {
-      return true;
-    }
-
-    // Check matches initials
-    // TODO investigate faster implementation
-    query = digitsOnly(query);
-    int queryIndex = 0;
-
-    String[] names = name.toLowerCase().split("\\s");
-    for (int i = 0; i < names.length && queryIndex < query.length(); i++) {
-      if (TextUtils.isEmpty(names[i])) {
-        continue;
-      }
-
-      if (getDigit(names[i].charAt(0)) == query.charAt(queryIndex)) {
-        queryIndex++;
-      }
-    }
-
-    return queryIndex == query.length();
-  }
-
-  /** @return true if the number belongs to the query. */
-  static boolean numberMatchesNumberQuery(String query, String number) {
-    return PhoneNumberUtils.isGlobalPhoneNumber(query)
-        && indexOfQueryNonDigitsIgnored(query, number) != -1;
-  }
-
-  /**
-   * Checks if query is contained in number while ignoring all characters in both that are not
-   * digits (i.e. {@link Character#isDigit(char)} returns false).
-   *
-   * @return index where query is found with all non-digits removed, -1 if it's not found.
-   */
-  private static int indexOfQueryNonDigitsIgnored(@NonNull String query, @NonNull String number) {
-    return digitsOnly(number).indexOf(digitsOnly(query));
-  }
-
-  // Returns string with letters replaced with their T9 representation.
-  private static String getT9Representation(String s) {
-    StringBuilder builder = new StringBuilder(s.length());
-    for (char c : s.toLowerCase().toCharArray()) {
-      builder.append(getDigit(c));
-    }
-    return builder.toString();
-  }
-
-  /** @return String s with only digits recognized by Character#isDigit() remaining */
-  static String digitsOnly(String s) {
-    StringBuilder sb = new StringBuilder();
-    for (int i = 0; i < s.length(); i++) {
-      char c = s.charAt(i);
-      if (Character.isDigit(c)) {
-        sb.append(c);
-      }
-    }
-    return sb.toString();
-  }
-
-  // Returns the T9 representation of a lower case character, otherwise returns the character.
-  private static char getDigit(char c) {
-    switch (c) {
-      case 'a':
-      case 'b':
-      case 'c':
-        return '2';
-      case 'd':
-      case 'e':
-      case 'f':
-        return '3';
-      case 'g':
-      case 'h':
-      case 'i':
-        return '4';
-      case 'j':
-      case 'k':
-      case 'l':
-        return '5';
-      case 'm':
-      case 'n':
-      case 'o':
-        return '6';
-      case 'p':
-      case 'q':
-      case 'r':
-      case 's':
-        return '7';
-      case 't':
-      case 'u':
-      case 'v':
-        return '8';
-      case 'w':
-      case 'x':
-      case 'y':
-      case 'z':
-        return '9';
-      default:
-        return c;
-    }
-  }
-}
diff --git a/java/com/android/dialer/searchfragment/SearchAdapter.java b/java/com/android/dialer/searchfragment/SearchAdapter.java
deleted file mode 100644
index 8f52415..0000000
--- a/java/com/android/dialer/searchfragment/SearchAdapter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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
- */
-
-package com.android.dialer.searchfragment;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-import com.android.dialer.common.Assert;
-import com.android.dialer.searchfragment.SearchCursorManager.RowType;
-
-/** RecyclerView adapter for {@link NewSearchFragment}. */
-class SearchAdapter extends RecyclerView.Adapter<ViewHolder> {
-
-  private final SearchCursorManager searchCursorManager;
-  private final Context context;
-
-  private String query;
-
-  SearchAdapter(Context context) {
-    searchCursorManager = new SearchCursorManager();
-    this.context = context;
-  }
-
-  // TODO: fill in the rest of the view holders.
-  @Override
-  public ViewHolder onCreateViewHolder(ViewGroup root, int position) {
-    @RowType int rowType = searchCursorManager.getRowType(position);
-    switch (rowType) {
-      case RowType.CONTACT_ROW:
-        return new SearchContactViewHolder(
-            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false));
-      case RowType.DIRECTORY_HEADER:
-      case RowType.DIRECTORY_ROW:
-      case RowType.INVALID:
-      case RowType.NEARBY_PLACES_HEADER:
-      case RowType.NEARBY_PLACES_ROW:
-        return null;
-      default:
-        throw Assert.createIllegalStateFailException("Invalid RowType: " + rowType);
-    }
-  }
-
-  @Override
-  public void onBindViewHolder(ViewHolder holder, int position) {
-    Cursor cursor = searchCursorManager.getCursor(position);
-    ((SearchContactViewHolder) holder).bind(cursor, query);
-  }
-
-  void setContactsCursor(Cursor cursor) {
-    searchCursorManager.setContactsCursor(cursor);
-  }
-
-  void clear() {
-    searchCursorManager.clear();
-  }
-
-  @Override
-  public int getItemCount() {
-    return searchCursorManager.getCount();
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-    searchCursorManager.setQuery(query);
-    notifyDataSetChanged();
-  }
-}
diff --git a/java/com/android/dialer/searchfragment/AndroidManifest.xml b/java/com/android/dialer/searchfragment/common/AndroidManifest.xml
similarity index 90%
copy from java/com/android/dialer/searchfragment/AndroidManifest.xml
copy to java/com/android/dialer/searchfragment/common/AndroidManifest.xml
index 88ce67c..178cd83 100644
--- a/java/com/android/dialer/searchfragment/AndroidManifest.xml
+++ b/java/com/android/dialer/searchfragment/common/AndroidManifest.xml
@@ -13,4 +13,4 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->
-<manifest  package="com.android.dialer.searchfragment"/>
\ No newline at end of file
+<manifest  package="com.android.dialer.searchfragment.common"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/SearchContactsCursorLoader.java b/java/com/android/dialer/searchfragment/common/Projections.java
similarity index 73%
rename from java/com/android/dialer/searchfragment/SearchContactsCursorLoader.java
rename to java/com/android/dialer/searchfragment/common/Projections.java
index 309dfff..37e20d1 100644
--- a/java/com/android/dialer/searchfragment/SearchContactsCursorLoader.java
+++ b/java/com/android/dialer/searchfragment/common/Projections.java
@@ -11,17 +11,15 @@
  * 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.
+ * limitations under the License
  */
 
-package com.android.dialer.searchfragment;
+package com.android.dialer.searchfragment.common;
 
-import android.content.Context;
-import android.content.CursorLoader;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 
-/** Cursor Loader for {@link NewSearchFragment}. */
-final class SearchContactsCursorLoader extends CursorLoader {
+/** Class containing relevant projections for searching contacts. */
+public class Projections {
 
   public static final int PHONE_ID = 0;
   public static final int PHONE_TYPE = 1;
@@ -34,9 +32,9 @@
   public static final int PHONE_CARRIER_PRESENCE = 8;
 
   @SuppressWarnings("unused")
-  public static final int PHONE_SOFT_KEY = 9;
+  public static final int PHONE_SORT_KEY = 9;
 
-  static final String[] PHONE_PROJECTION =
+  public static final String[] PHONE_PROJECTION =
       new String[] {
         Phone._ID, // 0
         Phone.TYPE, // 1
@@ -49,9 +47,4 @@
         Phone.CARRIER_PRESENCE, // 8
         Phone.SORT_KEY_PRIMARY // 9
       };
-
-  SearchContactsCursorLoader(Context context) {
-    super(
-        context, Phone.CONTENT_URI, PHONE_PROJECTION, null, null, Phone.SORT_KEY_PRIMARY + " ASC");
-  }
 }
diff --git a/java/com/android/dialer/searchfragment/common/QueryBoldingUtil.java b/java/com/android/dialer/searchfragment/common/QueryBoldingUtil.java
new file mode 100644
index 0000000..7bdd695
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/QueryBoldingUtil.java
@@ -0,0 +1,154 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.searchfragment.common;
+
+import android.graphics.Typeface;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.style.StyleSpan;
+
+/** Utility class for handling bolding queries contained in string. */
+public class QueryBoldingUtil {
+
+  /**
+   * Compares a name and query and returns a {@link CharSequence} with bolded characters.
+   *
+   * <p>Some example:
+   *
+   * <ul>
+   *   <li>"query" would bold "John [query] Smith"
+   *   <li>"222" would bold "[AAA] Mom"
+   *   <li>"222" would bold "[A]llen [A]lex [A]aron"
+   * </ul>
+   *
+   * @param query containing any characters
+   * @param name of a contact/string that query will compare to
+   * @return name with query bolded if query can be found in the name.
+   */
+  public static CharSequence getNameWithQueryBolded(@Nullable String query, @NonNull String name) {
+    if (TextUtils.isEmpty(query)) {
+      return name;
+    }
+
+    int index = -1;
+    int numberOfBoldedCharacters = 0;
+
+    if (QueryFilteringUtil.nameMatchesT9Query(query, name)) {
+      // Bold the characters that match the t9 query
+      String t9 = QueryFilteringUtil.getT9Representation(name);
+      index = QueryFilteringUtil.indexOfQueryNonDigitsIgnored(query, t9);
+      if (index == -1) {
+        return getNameWithInitialsBolded(query, name);
+      }
+      numberOfBoldedCharacters = query.length();
+
+      for (int i = 0; i < query.length(); i++) {
+        char c = query.charAt(i);
+        if (!Character.isDigit(c)) {
+          numberOfBoldedCharacters--;
+        }
+      }
+
+      for (int i = 0; i < index + numberOfBoldedCharacters; i++) {
+        if (!Character.isLetterOrDigit(name.charAt(i))) {
+          if (i < index) {
+            index++;
+          } else {
+            numberOfBoldedCharacters++;
+          }
+        }
+      }
+    }
+
+    if (index == -1) {
+      // Bold the query as an exact match in the name
+      index = name.toLowerCase().indexOf(query);
+      numberOfBoldedCharacters = query.length();
+    }
+
+    return index == -1 ? name : getBoldedString(name, index, numberOfBoldedCharacters);
+  }
+
+  private static CharSequence getNameWithInitialsBolded(String query, String name) {
+    SpannableString boldedInitials = new SpannableString(name);
+    name = name.toLowerCase();
+    int initialsBolded = 0;
+    int nameIndex = -1;
+
+    while (++nameIndex < name.length() && initialsBolded < query.length()) {
+      if ((nameIndex == 0 || name.charAt(nameIndex - 1) == ' ')
+          && QueryFilteringUtil.getDigit(name.charAt(nameIndex)) == query.charAt(initialsBolded)) {
+        boldedInitials.setSpan(
+            new StyleSpan(Typeface.BOLD),
+            nameIndex,
+            nameIndex + 1,
+            Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+        initialsBolded++;
+      }
+    }
+    return boldedInitials;
+  }
+
+  /**
+   * Compares a number and a query and returns a {@link CharSequence} with bolded characters.
+   *
+   * <ul>
+   *   <li>"123" would bold "(650)34[1-23]24"
+   *   <li>"123" would bold "+1([123])111-2222
+   * </ul>
+   *
+   * @param query containing only numbers and phone number related characters "(", ")", "-", "+"
+   * @param number phone number of a contact that the query will compare to.
+   * @return number with query bolded if query can be found in the number.
+   */
+  public static CharSequence getNumberWithQueryBolded(
+      @Nullable String query, @NonNull String number) {
+    if (TextUtils.isEmpty(query) || !QueryFilteringUtil.numberMatchesNumberQuery(query, number)) {
+      return number;
+    }
+
+    int index = QueryFilteringUtil.indexOfQueryNonDigitsIgnored(query, number);
+    int boldedCharacters = query.length();
+
+    for (char c : query.toCharArray()) {
+      if (!Character.isDigit(c)) {
+        boldedCharacters--;
+      }
+    }
+
+    for (int i = 0; i < index + boldedCharacters; i++) {
+      if (!Character.isDigit(number.charAt(i))) {
+        if (i <= index) {
+          index++;
+        } else {
+          boldedCharacters++;
+        }
+      }
+    }
+    return getBoldedString(number, index, boldedCharacters);
+  }
+
+  private static SpannableString getBoldedString(String s, int index, int numBolded) {
+    SpannableString span = new SpannableString(s);
+    span.setSpan(
+        new StyleSpan(Typeface.BOLD), index, index + numBolded, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+    return span;
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java b/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java
new file mode 100644
index 0000000..b23315b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java
@@ -0,0 +1,141 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.searchfragment.common;
+
+import android.support.annotation.NonNull;
+import android.telephony.PhoneNumberUtils;
+import android.text.TextUtils;
+import java.util.regex.Pattern;
+
+/** Utility class for filtering, comparing and handling strings and queries. */
+public class QueryFilteringUtil {
+
+  /** Matches strings with "-", "(", ")", 2-9 of at least length one. */
+  static final Pattern T9_PATTERN = Pattern.compile("[\\-()2-9]+");
+
+  /**
+   * @return true if the query is of T9 format and the name's T9 representation belongs to the
+   *     query; false otherwise.
+   */
+  public static boolean nameMatchesT9Query(String query, String name) {
+    if (!T9_PATTERN.matcher(query).matches()) {
+      return false;
+    }
+
+    // Substring
+    if (indexOfQueryNonDigitsIgnored(query, getT9Representation(name)) != -1) {
+      return true;
+    }
+
+    // Check matches initials
+    // TODO investigate faster implementation
+    query = digitsOnly(query);
+    int queryIndex = 0;
+
+    String[] names = name.toLowerCase().split("\\s");
+    for (int i = 0; i < names.length && queryIndex < query.length(); i++) {
+      if (TextUtils.isEmpty(names[i])) {
+        continue;
+      }
+
+      if (getDigit(names[i].charAt(0)) == query.charAt(queryIndex)) {
+        queryIndex++;
+      }
+    }
+
+    return queryIndex == query.length();
+  }
+
+  /** @return true if the number belongs to the query. */
+  public static boolean numberMatchesNumberQuery(String query, String number) {
+    return PhoneNumberUtils.isGlobalPhoneNumber(query)
+        && indexOfQueryNonDigitsIgnored(query, number) != -1;
+  }
+
+  /**
+   * Checks if query is contained in number while ignoring all characters in both that are not
+   * digits (i.e. {@link Character#isDigit(char)} returns false).
+   *
+   * @return index where query is found with all non-digits removed, -1 if it's not found.
+   */
+  static int indexOfQueryNonDigitsIgnored(@NonNull String query, @NonNull String number) {
+    return digitsOnly(number).indexOf(digitsOnly(query));
+  }
+
+  // Returns string with letters replaced with their T9 representation.
+  static String getT9Representation(String s) {
+    StringBuilder builder = new StringBuilder(s.length());
+    for (char c : s.toLowerCase().toCharArray()) {
+      builder.append(getDigit(c));
+    }
+    return builder.toString();
+  }
+
+  /** @return String s with only digits recognized by Character#isDigit() remaining */
+  public static String digitsOnly(String s) {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < s.length(); i++) {
+      char c = s.charAt(i);
+      if (Character.isDigit(c)) {
+        sb.append(c);
+      }
+    }
+    return sb.toString();
+  }
+
+  // Returns the T9 representation of a lower case character, otherwise returns the character.
+  static char getDigit(char c) {
+    switch (c) {
+      case 'a':
+      case 'b':
+      case 'c':
+        return '2';
+      case 'd':
+      case 'e':
+      case 'f':
+        return '3';
+      case 'g':
+      case 'h':
+      case 'i':
+        return '4';
+      case 'j':
+      case 'k':
+      case 'l':
+        return '5';
+      case 'm':
+      case 'n':
+      case 'o':
+        return '6';
+      case 'p':
+      case 'q':
+      case 'r':
+      case 's':
+        return '7';
+      case 't':
+      case 'u':
+      case 'v':
+        return '8';
+      case 'w':
+      case 'x':
+      case 'y':
+      case 'z':
+        return '9';
+      default:
+        return c;
+    }
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/res/layout/search_contact_row.xml b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
similarity index 80%
rename from java/com/android/dialer/searchfragment/res/layout/search_contact_row.xml
rename to java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
index efeca0e..dd871af 100644
--- a/java/com/android/dialer/searchfragment/res/layout/search_contact_row.xml
+++ b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
@@ -19,8 +19,8 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="@dimen/search_row_height"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
     android:background="?android:attr/selectableItemBackground">
 
   <QuickContactBadge
@@ -44,11 +44,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/search_text_padding_start"
         android:gravity="center_vertical|start"
-        android:textSize="@dimen/new_search_text_size"
-        android:textColor="@color/dialer_primary_text_color"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:fontFamily="sans-serif"/>
+        android:fontFamily="sans-serif"
+        style="@style/PrimaryText"/>
 
     <TextView
         android:id="@+id/secondary"
@@ -56,11 +53,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/search_text_padding_start"
         android:gravity="center_vertical|start"
-        android:textSize="@dimen/new_search_text_size"
-        android:textColor="@color/dialer_primary_text_color"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:fontFamily="sans-serif"/>
+        android:fontFamily="sans-serif"
+        style="@style/SecondaryText"/>
   </LinearLayout>
 
   <ImageView
@@ -69,7 +63,7 @@
       android:layout_height="@dimen/search_row_height"
       android:layout_alignParentEnd="true"
       android:padding="@dimen/call_to_action_padding"
-      android:tint="@color/secondary_text_color"
+      android:tint="@color/dialer_secondary_text_color"
       android:visibility="gone"
       android:scaleType="center"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/res/values/dimens.xml b/java/com/android/dialer/searchfragment/common/res/values/dimens.xml
similarity index 100%
rename from java/com/android/dialer/searchfragment/res/values/dimens.xml
rename to java/com/android/dialer/searchfragment/common/res/values/dimens.xml
diff --git a/java/com/android/dialer/searchfragment/SearchContactCursor.java b/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java
similarity index 91%
rename from java/com/android/dialer/searchfragment/SearchContactCursor.java
rename to java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java
index 5006e1a..a2ef58c 100644
--- a/java/com/android/dialer/searchfragment/SearchContactCursor.java
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.searchfragment;
+package com.android.dialer.searchfragment.cp2;
 
 import android.content.ContentResolver;
 import android.database.CharArrayBuffer;
@@ -26,6 +26,8 @@
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.common.QueryFilteringUtil;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -37,7 +39,7 @@
  * <p>This cursor removes duplicate phone numbers associated with the same contact and can filter
  * contacts based on a query by calling {@link #filter(String)}.
  */
-final class SearchContactCursor implements Cursor {
+public final class SearchContactCursor implements Cursor {
 
   private final Cursor cursor;
   // List of cursor ids that are valid for displaying after filtering.
@@ -61,10 +63,10 @@
   }
 
   /**
-   * @param cursor with projection {@link SearchContactsCursorLoader#PHONE_PROJECTION}.
+   * @param cursor with projection {@link Projections#PHONE_PROJECTION}.
    * @param query to filter cursor results.
    */
-  SearchContactCursor(Cursor cursor, @Nullable String query) {
+  public SearchContactCursor(Cursor cursor, @Nullable String query) {
     // TODO investigate copying this into a MatrixCursor and holding in memory
     this.cursor = cursor;
     filter(query);
@@ -77,7 +79,7 @@
    *
    * <ul>
    *   <li>A phone number
-   *   <li>A T9 representation of a name (matches {@link QueryUtil#T9_PATTERN}).
+   *   <li>A T9 representation of a name (matches {@link QueryFilteringUtil#T9_PATTERN}).
    *   <li>A name
    * </ul>
    *
@@ -89,7 +91,7 @@
    *   <li>Its name contains the query
    * </ul>
    */
-  void filter(@Nullable String query) {
+  public void filter(@Nullable String query) {
     if (query == null) {
       query = "";
     }
@@ -108,8 +110,8 @@
 
     while (cursor.moveToNext()) {
       int position = cursor.getPosition();
-      String currentNumber = cursor.getString(SearchContactsCursorLoader.PHONE_NUMBER);
-      String currentName = cursor.getString(SearchContactsCursorLoader.PHONE_DISPLAY_NAME);
+      String currentNumber = cursor.getString(Projections.PHONE_NUMBER);
+      String currentName = cursor.getString(Projections.PHONE_DISPLAY_NAME);
 
       if (!previousName.equals(currentName)) {
         previousName = currentName;
@@ -138,8 +140,8 @@
       }
 
       if (TextUtils.isEmpty(query)
-          || QueryUtil.nameMatchesT9Query(query, previousName)
-          || QueryUtil.numberMatchesNumberQuery(query, previousMostQualifiedNumber)
+          || QueryFilteringUtil.nameMatchesT9Query(query, previousName)
+          || QueryFilteringUtil.numberMatchesNumberQuery(query, previousMostQualifiedNumber)
           || previousName.contains(query)) {
         queryFilteredPositions.add(previousMostQualifiedPosition);
       }
@@ -156,8 +158,8 @@
    */
   private @Qualification int getQualification(String number, String mostQualifiedNumber) {
     // Ignore formatting
-    String numberDigits = QueryUtil.digitsOnly(number);
-    String qualifiedNumberDigits = QueryUtil.digitsOnly(mostQualifiedNumber);
+    String numberDigits = QueryFilteringUtil.digitsOnly(number);
+    String qualifiedNumberDigits = QueryFilteringUtil.digitsOnly(mostQualifiedNumber);
 
     // If the numbers are identical, return version with more formatting
     if (qualifiedNumberDigits.equals(numberDigits)) {
diff --git a/java/com/android/dialer/searchfragment/SearchContactViewHolder.java b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
similarity index 77%
rename from java/com/android/dialer/searchfragment/SearchContactViewHolder.java
rename to java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
index 4ac6af3..5f06b59 100644
--- a/java/com/android/dialer/searchfragment/SearchContactViewHolder.java
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.searchfragment;
+package com.android.dialer.searchfragment.cp2;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -35,20 +35,19 @@
 import com.android.dialer.callintent.CallInitiationType.Type;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.Assert;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.common.QueryBoldingUtil;
+import com.android.dialer.searchfragment.common.R;
 import com.android.dialer.telecom.TelecomUtil;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-/** ViewHolder for a contact row in {@link NewSearchFragment}. */
-final class SearchContactViewHolder extends ViewHolder implements OnClickListener {
+/** ViewHolder for a contact row. */
+public final class SearchContactViewHolder extends ViewHolder implements OnClickListener {
 
   /** IntDef for the different types of actions that can be shown. */
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({
-    SearchContactViewHolder.CallToAction.NONE,
-    SearchContactViewHolder.CallToAction.VIDEO_CALL,
-    SearchContactViewHolder.CallToAction.SHARE_AND_CALL
-  })
+  @IntDef({CallToAction.NONE, CallToAction.VIDEO_CALL, CallToAction.SHARE_AND_CALL})
   @interface CallToAction {
     int NONE = 0;
     int VIDEO_CALL = 1;
@@ -64,7 +63,7 @@
   private String number;
   private @CallToAction int currentAction;
 
-  SearchContactViewHolder(View view) {
+  public SearchContactViewHolder(View view) {
     super(view);
     view.setOnClickListener(this);
     photo = view.findViewById(R.id.photo);
@@ -78,29 +77,29 @@
    * Binds the ViewHolder with a cursor from {@link SearchContactsCursorLoader} with the data found
    * at the cursors set position.
    */
-  void bind(Cursor cursor, String query) {
-    number = cursor.getString(SearchContactsCursorLoader.PHONE_NUMBER);
-    String name = cursor.getString(SearchContactsCursorLoader.PHONE_DISPLAY_NAME);
+  public void bind(Cursor cursor, String query) {
+    number = cursor.getString(Projections.PHONE_NUMBER);
+    String name = cursor.getString(Projections.PHONE_DISPLAY_NAME);
     String label = getLabel(context.getResources(), cursor);
     String secondaryInfo =
         TextUtils.isEmpty(label)
             ? number
-            : context.getString(R.string.call_subject_type_and_number, label, number);
+            : context.getString(
+                com.android.contacts.common.R.string.call_subject_type_and_number, label, number);
 
-    nameOrNumberView.setText(QueryUtil.getNameWithQueryBolded(query, name));
-    numberView.setText(QueryUtil.getNumberWithQueryBolded(query, secondaryInfo));
+    nameOrNumberView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name));
+    numberView.setText(QueryBoldingUtil.getNumberWithQueryBolded(query, secondaryInfo));
     setCallToAction(cursor);
 
     if (shouldShowPhoto(cursor, name)) {
       nameOrNumberView.setVisibility(View.VISIBLE);
       photo.setVisibility(View.VISIBLE);
-      photo.setContentDescription(context.getString(R.string.description_quick_contact_for, name));
-      String photoUri = cursor.getString(SearchContactsCursorLoader.PHONE_PHOTO_URI);
+      String photoUri = cursor.getString(Projections.PHONE_PHOTO_URI);
       ContactPhotoManager.getInstance(context)
           .loadDialerThumbnailOrPhoto(
               photo,
               getContactUri(cursor),
-              cursor.getLong(SearchContactsCursorLoader.PHONE_PHOTO_ID),
+              cursor.getLong(Projections.PHONE_PHOTO_ID),
               photoUri == null ? null : Uri.parse(photoUri),
               name,
               LetterTileDrawable.TYPE_DEFAULT);
@@ -116,23 +115,23 @@
       return true;
     } else {
       cursor.moveToPosition(currentPosition - 1);
-      String previousName = cursor.getString(SearchContactsCursorLoader.PHONE_DISPLAY_NAME);
+      String previousName = cursor.getString(Projections.PHONE_DISPLAY_NAME);
       cursor.moveToPosition(currentPosition);
       return !currentName.equals(previousName);
     }
   }
 
   private static Uri getContactUri(Cursor cursor) {
-    long contactId = cursor.getLong(SearchContactsCursorLoader.PHONE_ID);
-    String lookupKey = cursor.getString(SearchContactsCursorLoader.PHONE_LOOKUP_KEY);
+    long contactId = cursor.getLong(Projections.PHONE_ID);
+    String lookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
     return Contacts.getLookupUri(contactId, lookupKey);
   }
 
   // TODO: handle CNAP and cequint types.
   // TODO: unify this into a utility method with CallLogAdapter#getNumberType
   private static String getLabel(Resources resources, Cursor cursor) {
-    int numberType = cursor.getInt(SearchContactsCursorLoader.PHONE_TYPE);
-    String numberLabel = cursor.getString(SearchContactsCursorLoader.PHONE_LABEL);
+    int numberType = cursor.getInt(Projections.PHONE_TYPE);
+    String numberLabel = cursor.getString(Projections.PHONE_LABEL);
 
     // Returns empty label instead of "custom" if the custom label is empty.
     if (numberType == Phone.TYPE_CUSTOM && TextUtils.isEmpty(numberLabel)) {
@@ -150,7 +149,8 @@
         break;
       case CallToAction.SHARE_AND_CALL:
         callToActionView.setVisibility(View.VISIBLE);
-        callToActionView.setImageDrawable(context.getDrawable(R.drawable.ic_phone_attach));
+        callToActionView.setImageDrawable(
+            context.getDrawable(com.android.contacts.common.R.drawable.ic_phone_attach));
         callToActionView.setOnClickListener(this);
         break;
       case CallToAction.VIDEO_CALL:
@@ -166,7 +166,7 @@
   }
 
   private static @CallToAction int getCallToAction(Cursor cursor) {
-    int carrierPresence = cursor.getInt(SearchContactsCursorLoader.PHONE_CARRIER_PRESENCE);
+    int carrierPresence = cursor.getInt(Projections.PHONE_CARRIER_PRESENCE);
     if ((carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) == 1) {
       return CallToAction.VIDEO_CALL;
     }
@@ -181,7 +181,8 @@
       switch (currentAction) {
         case CallToAction.SHARE_AND_CALL:
           callToActionView.setVisibility(View.VISIBLE);
-          callToActionView.setImageDrawable(context.getDrawable(R.drawable.ic_phone_attach));
+          callToActionView.setImageDrawable(
+              context.getDrawable(com.android.contacts.common.R.drawable.ic_phone_attach));
           // TODO: open call composer.
           break;
         case CallToAction.VIDEO_CALL:
diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
new file mode 100644
index 0000000..c72f28b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+package com.android.dialer.searchfragment.cp2;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.database.Cursor;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import com.android.dialer.searchfragment.common.Projections;
+
+/** Cursor Loader for CP2 contacts. */
+public final class SearchContactsCursorLoader extends CursorLoader {
+
+  public SearchContactsCursorLoader(Context context) {
+    super(
+        context,
+        Phone.CONTENT_URI,
+        Projections.PHONE_PROJECTION,
+        null,
+        null,
+        Phone.SORT_KEY_PRIMARY + " ASC");
+  }
+
+  @Override
+  public Cursor loadInBackground() {
+    return new SearchContactCursor(super.loadInBackground(), null);
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/AndroidManifest.xml b/java/com/android/dialer/searchfragment/list/AndroidManifest.xml
similarity index 90%
rename from java/com/android/dialer/searchfragment/AndroidManifest.xml
rename to java/com/android/dialer/searchfragment/list/AndroidManifest.xml
index 88ce67c..e0890cc 100644
--- a/java/com/android/dialer/searchfragment/AndroidManifest.xml
+++ b/java/com/android/dialer/searchfragment/list/AndroidManifest.xml
@@ -13,4 +13,4 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->
-<manifest  package="com.android.dialer.searchfragment"/>
\ No newline at end of file
+<manifest  package="com.android.dialer.searchfragment.list"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/list/HeaderViewHolder.java b/java/com/android/dialer/searchfragment/list/HeaderViewHolder.java
new file mode 100644
index 0000000..dd35b13
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/HeaderViewHolder.java
@@ -0,0 +1,36 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.searchfragment.list;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.TextView;
+
+/** ViewHolder for header rows in {@link NewSearchFragment}. */
+final class HeaderViewHolder extends RecyclerView.ViewHolder {
+
+  private final TextView header;
+
+  HeaderViewHolder(View view) {
+    super(view);
+    header = view.findViewById(R.id.header);
+  }
+
+  public void setHeader(String header) {
+    this.header.setText(header);
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
new file mode 100644
index 0000000..fcc87c3
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
@@ -0,0 +1,125 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.searchfragment.list;
+
+import android.app.Fragment;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.Loader;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.contacts.common.extensions.PhoneDirectoryExtenderAccessor;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.searchfragment.cp2.SearchContactsCursorLoader;
+import com.android.dialer.searchfragment.nearbyplaces.NearbyPlacesCursorLoader;
+
+/** Fragment used for searching contacts. */
+public final class NewSearchFragment extends Fragment implements LoaderCallbacks<Cursor> {
+
+  // Since some of our queries can generate network requests, we should delay them until the user
+  // stops typing to prevent generating too much network traffic.
+  private static final int NETWORK_SEARCH_DELAY_MILLIS = 300;
+
+  private static final int CONTACTS_LOADER_ID = 0;
+  private static final int NEARBY_PLACES_ID = 1;
+
+  private RecyclerView recyclerView;
+  private SearchAdapter adapter;
+  private String query;
+
+  private final Runnable loadNearbyPlacesRunnable =
+      () -> getLoaderManager().restartLoader(NEARBY_PLACES_ID, null, this);
+
+  @Nullable
+  @Override
+  public View onCreateView(
+      LayoutInflater inflater, @Nullable ViewGroup parent, @Nullable Bundle bundle) {
+    getLoaderManager().initLoader(0, null, this);
+    View view = inflater.inflate(R.layout.fragment_search, parent, false);
+    adapter = new SearchAdapter(getContext());
+    recyclerView = view.findViewById(R.id.recycler_view);
+    recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+    recyclerView.setAdapter(adapter);
+
+    getLoaderManager().initLoader(CONTACTS_LOADER_ID, null, this);
+    loadNearbyPlacesCursor();
+    return view;
+  }
+
+  @Override
+  public Loader<Cursor> onCreateLoader(int id, Bundle bundle) {
+    // TODO add enterprise loader
+    if (id == CONTACTS_LOADER_ID) {
+      return new SearchContactsCursorLoader(getContext());
+    } else if (id == NEARBY_PLACES_ID) {
+      return new NearbyPlacesCursorLoader(getContext(), query);
+    } else {
+      throw new IllegalStateException("Invalid loader id: " + id);
+    }
+  }
+
+  @Override
+  public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
+    if (loader instanceof SearchContactsCursorLoader) {
+      adapter.setContactsCursor(cursor);
+    } else if (loader instanceof NearbyPlacesCursorLoader) {
+      adapter.setNearbyPlacesCursor(cursor);
+    } else {
+      throw new IllegalStateException("Invalid loader: " + loader);
+    }
+  }
+
+  @Override
+  public void onLoaderReset(Loader<Cursor> loader) {
+    adapter.clear();
+    recyclerView.setAdapter(null);
+  }
+
+  public void setQuery(String query) {
+    this.query = query;
+    if (adapter != null) {
+      adapter.setQuery(query);
+      loadNearbyPlacesCursor();
+    }
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    // close adapters
+    adapter.setNearbyPlacesCursor(null);
+    adapter.setContactsCursor(null);
+    ThreadUtil.getUiThreadHandler().removeCallbacks(loadNearbyPlacesRunnable);
+  }
+
+  private void loadNearbyPlacesCursor() {
+    // Cancel existing load if one exists.
+    ThreadUtil.getUiThreadHandler().removeCallbacks(loadNearbyPlacesRunnable);
+
+    // If nearby places is not enabled, do not try to load them.
+    if (!PhoneDirectoryExtenderAccessor.get(getContext()).isEnabled(getContext())) {
+      return;
+    }
+    ThreadUtil.getUiThreadHandler()
+        .postDelayed(loadNearbyPlacesRunnable, NETWORK_SEARCH_DELAY_MILLIS);
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/list/SearchAdapter.java b/java/com/android/dialer/searchfragment/list/SearchAdapter.java
new file mode 100644
index 0000000..023513e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/SearchAdapter.java
@@ -0,0 +1,108 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.searchfragment.list;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import com.android.dialer.common.Assert;
+import com.android.dialer.searchfragment.cp2.SearchContactViewHolder;
+import com.android.dialer.searchfragment.list.SearchCursorManager.RowType;
+import com.android.dialer.searchfragment.nearbyplaces.NearbyPlaceViewHolder;
+
+/** RecyclerView adapter for {@link NewSearchFragment}. */
+class SearchAdapter extends RecyclerView.Adapter<ViewHolder> {
+
+  private final SearchCursorManager searchCursorManager;
+  private final Context context;
+
+  private String query;
+
+  SearchAdapter(Context context) {
+    searchCursorManager = new SearchCursorManager();
+    this.context = context;
+  }
+
+  @Override
+  public ViewHolder onCreateViewHolder(ViewGroup root, @RowType int rowType) {
+    switch (rowType) {
+      case RowType.CONTACT_ROW:
+        return new SearchContactViewHolder(
+            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false));
+      case RowType.NEARBY_PLACES_ROW:
+        return new NearbyPlaceViewHolder(
+            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false));
+      case RowType.DIRECTORY_HEADER:
+      case RowType.NEARBY_PLACES_HEADER:
+        return new HeaderViewHolder(
+            LayoutInflater.from(context).inflate(R.layout.header_layout, root, false));
+      case RowType.DIRECTORY_ROW: // TODO: add directory rows to search
+      case RowType.INVALID:
+      default:
+        throw Assert.createIllegalStateFailException("Invalid RowType: " + rowType);
+    }
+  }
+
+  @Override
+  public @RowType int getItemViewType(int position) {
+    return searchCursorManager.getRowType(position);
+  }
+
+  @Override
+  public void onBindViewHolder(ViewHolder holder, int position) {
+    if (holder instanceof SearchContactViewHolder) {
+      Cursor cursor = searchCursorManager.getCursor(position);
+      ((SearchContactViewHolder) holder).bind(cursor, query);
+    } else if (holder instanceof NearbyPlaceViewHolder) {
+      Cursor cursor = searchCursorManager.getCursor(position);
+      ((NearbyPlaceViewHolder) holder).bind(cursor, query);
+    } else if (holder instanceof HeaderViewHolder) {
+      String header = context.getString(searchCursorManager.getHeaderText(position));
+      ((HeaderViewHolder) holder).setHeader(header);
+    } else {
+      throw Assert.createIllegalStateFailException("Invalid ViewHolder: " + holder);
+    }
+  }
+
+  void setContactsCursor(Cursor cursor) {
+    searchCursorManager.setContactsCursor(cursor);
+    notifyDataSetChanged();
+  }
+
+  void clear() {
+    searchCursorManager.clear();
+  }
+
+  @Override
+  public int getItemCount() {
+    return searchCursorManager.getCount();
+  }
+
+  public void setQuery(String query) {
+    this.query = query;
+    searchCursorManager.setQuery(query);
+    notifyDataSetChanged();
+  }
+
+  public void setNearbyPlacesCursor(Cursor nearbyPlacesCursor) {
+    searchCursorManager.setNearbyPlacesCursor(nearbyPlacesCursor);
+    notifyDataSetChanged();
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/SearchCursorManager.java b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
similarity index 84%
rename from java/com/android/dialer/searchfragment/SearchCursorManager.java
rename to java/com/android/dialer/searchfragment/list/SearchCursorManager.java
index 64c4fc1..216a9ad 100644
--- a/java/com/android/dialer/searchfragment/SearchCursorManager.java
+++ b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
@@ -14,11 +14,13 @@
  * limitations under the License
  */
 
-package com.android.dialer.searchfragment;
+package com.android.dialer.searchfragment.list;
 
 import android.database.Cursor;
 import android.support.annotation.IntDef;
+import android.support.annotation.StringRes;
 import com.android.dialer.common.Assert;
+import com.android.dialer.searchfragment.cp2.SearchContactCursor;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -73,6 +75,14 @@
   private Cursor corpDirectoryCursor = null;
 
   void setContactsCursor(Cursor cursor) {
+    if (cursor == contactsCursor) {
+      return;
+    }
+
+    if (contactsCursor != null && !contactsCursor.isClosed()) {
+      contactsCursor.close();
+    }
+
     if (cursor != null && cursor.getCount() > 0) {
       contactsCursor = cursor;
     } else {
@@ -81,6 +91,14 @@
   }
 
   void setNearbyPlacesCursor(Cursor cursor) {
+    if (cursor == nearbyPlacesCursor) {
+      return;
+    }
+
+    if (nearbyPlacesCursor != null && !nearbyPlacesCursor.isClosed()) {
+      nearbyPlacesCursor.close();
+    }
+
     if (cursor != null && cursor.getCount() > 0) {
       nearbyPlacesCursor = cursor;
     } else {
@@ -89,6 +107,14 @@
   }
 
   void setCorpDirectoryCursor(Cursor cursor) {
+    if (cursor == corpDirectoryCursor) {
+      return;
+    }
+
+    if (corpDirectoryCursor != null && !corpDirectoryCursor.isClosed()) {
+      corpDirectoryCursor.close();
+    }
+
     if (cursor != null && cursor.getCount() > 0) {
       corpDirectoryCursor = cursor;
     } else {
@@ -98,6 +124,7 @@
 
   void setQuery(String query) {
     if (contactsCursor != null) {
+      // TODO: abstract this
       ((SearchContactCursor) contactsCursor).filter(query);
     }
   }
@@ -209,6 +236,23 @@
     throw Assert.createIllegalStateFailException("No valid cursor.");
   }
 
+  @StringRes
+  int getHeaderText(int position) {
+    @RowType int rowType = getRowType(position);
+    switch (rowType) {
+      case RowType.NEARBY_PLACES_HEADER:
+        return R.string.nearby_places;
+      case RowType.DIRECTORY_HEADER: // TODO
+      case RowType.DIRECTORY_ROW:
+      case RowType.CONTACT_ROW:
+      case RowType.NEARBY_PLACES_ROW:
+      case RowType.INVALID:
+      default:
+        throw Assert.createIllegalStateFailException(
+            "Invalid row type, position " + position + " is rowtype " + rowType);
+    }
+  }
+
   /** removes all cursors. */
   void clear() {
     if (contactsCursor != null) {
diff --git a/java/com/android/dialer/searchfragment/res/layout/fragment_search.xml b/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml
similarity index 100%
rename from java/com/android/dialer/searchfragment/res/layout/fragment_search.xml
rename to java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml
diff --git a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
new file mode 100644
index 0000000..36af42e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.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
+  -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/header"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingStart="16dp"
+    style="@style/SecondaryText"/>
diff --git a/java/com/android/dialer/searchfragment/AndroidManifest.xml b/java/com/android/dialer/searchfragment/nearbyplaces/AndroidManifest.xml
similarity index 90%
copy from java/com/android/dialer/searchfragment/AndroidManifest.xml
copy to java/com/android/dialer/searchfragment/nearbyplaces/AndroidManifest.xml
index 88ce67c..178cd83 100644
--- a/java/com/android/dialer/searchfragment/AndroidManifest.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/AndroidManifest.xml
@@ -13,4 +13,4 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->
-<manifest  package="com.android.dialer.searchfragment"/>
\ No newline at end of file
+<manifest  package="com.android.dialer.searchfragment.common"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java
new file mode 100644
index 0000000..b6e5a90
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java
@@ -0,0 +1,90 @@
+/*
+ * 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
+ */
+
+package com.android.dialer.searchfragment.nearbyplaces;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.QuickContactBadge;
+import android.widget.TextView;
+import com.android.contacts.common.ContactPhotoManager;
+import com.android.contacts.common.lettertiles.LetterTileDrawable;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.common.QueryBoldingUtil;
+import com.android.dialer.searchfragment.common.R;
+import com.android.dialer.telecom.TelecomUtil;
+
+/** ViewHolder for a nearby place row. */
+public final class NearbyPlaceViewHolder extends RecyclerView.ViewHolder
+    implements View.OnClickListener {
+
+  private final Context context;
+  private final TextView placeName;
+  private final TextView placeAddress;
+  private final QuickContactBadge photo;
+
+  private String number;
+
+  public NearbyPlaceViewHolder(View view) {
+    super(view);
+    view.setOnClickListener(this);
+    photo = view.findViewById(R.id.photo);
+    placeName = view.findViewById(R.id.primary);
+    placeAddress = view.findViewById(R.id.secondary);
+    context = view.getContext();
+  }
+
+  /**
+   * Binds the ViewHolder with a cursor from {@link NearbyPlacesCursorLoader} with the data found at
+   * the cursors set position.
+   */
+  public void bind(Cursor cursor, String query) {
+    number = cursor.getString(Projections.PHONE_NUMBER);
+    String name = cursor.getString(Projections.PHONE_DISPLAY_NAME);
+    String address = cursor.getString(Projections.PHONE_LABEL);
+
+    placeName.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name));
+    placeAddress.setText(QueryBoldingUtil.getNameWithQueryBolded(query, address));
+
+    String photoUri = cursor.getString(Projections.PHONE_PHOTO_URI);
+    ContactPhotoManager.getInstance(context)
+        .loadDialerThumbnailOrPhoto(
+            photo,
+            getContactUri(cursor),
+            cursor.getLong(Projections.PHONE_PHOTO_ID),
+            photoUri == null ? null : Uri.parse(photoUri),
+            name,
+            LetterTileDrawable.TYPE_DEFAULT);
+  }
+
+  private static Uri getContactUri(Cursor cursor) {
+    long contactId = cursor.getLong(Projections.PHONE_ID);
+    String lookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
+    return ContactsContract.Contacts.getLookupUri(contactId, lookupKey);
+  }
+
+  @Override
+  public void onClick(View v) {
+    TelecomUtil.placeCall(
+        context, new CallIntentBuilder(number, CallInitiationType.Type.REGULAR_SEARCH).build());
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java
new file mode 100644
index 0000000..9f3193e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+package com.android.dialer.searchfragment.nearbyplaces;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import com.android.contacts.common.extensions.PhoneDirectoryExtenderAccessor;
+import com.android.dialer.searchfragment.common.Projections;
+
+/** Cursor loader for nearby places search results. */
+public final class NearbyPlacesCursorLoader extends CursorLoader {
+
+  private static final String MAX_RESULTS = "3";
+
+  public NearbyPlacesCursorLoader(Context context, String query) {
+    super(context, getContentUri(context, query), Projections.PHONE_PROJECTION, null, null, null);
+  }
+
+  private static Uri getContentUri(Context context, String query) {
+    return PhoneDirectoryExtenderAccessor.get(context)
+        .getContentUri()
+        .buildUpon()
+        .appendPath(query)
+        .appendQueryParameter(ContactsContract.LIMIT_PARAM_KEY, MAX_RESULTS)
+        .build();
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml
new file mode 100644
index 0000000..21eb4b1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Nabygeleë plekke"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml
new file mode 100644
index 0000000..d68b4d1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"الأماكن المجاورة"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..bb9f06f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Obližnja mesta"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml
new file mode 100644
index 0000000..e883953
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Места в района"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml
new file mode 100644
index 0000000..4bc3fed
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"আশপাশের জায়গাগুলি"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml
new file mode 100644
index 0000000..f3fb921
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Mjesta u blizini"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml
new file mode 100644
index 0000000..9e2db4a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Orte in der Nähe"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..0778273
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Places nearby"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..0778273
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Places nearby"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..0778273
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Places nearby"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml
new file mode 100644
index 0000000..fada6bc
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Sitios cercanos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..d65e7bd
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Adresses à proximité"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml
new file mode 100644
index 0000000..d65e7bd
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Adresses à proximité"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml
new file mode 100644
index 0000000..5a4cce7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Lugares próximos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml
new file mode 100644
index 0000000..ee32e46
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"નજીકના સ્થળો"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml
new file mode 100644
index 0000000..079c03e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"आस-पास के स्थल"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml
new file mode 100644
index 0000000..3a2ba39
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Մոտակա վայրեր"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml
new file mode 100644
index 0000000..0f07995
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"מקומות קרובים"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml
new file mode 100644
index 0000000..f05a332
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"주변 장소"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml
new file mode 100644
index 0000000..2ff0e85
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"ສະຖານທີ່ໃກ້ຄຽງ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml
new file mode 100644
index 0000000..9baf540
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Netoliese esančios vietos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml
new file mode 100644
index 0000000..707a6c9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Ойролцоох газрууд"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml
new file mode 100644
index 0000000..862cd04
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"जवळपासची ठिकाणे"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml
new file mode 100644
index 0000000..aed0bbb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Tempat berdekatan"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml
new file mode 100644
index 0000000..74e60a0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"အနီးတဝိုက်ရှိ နေရာများ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml
new file mode 100644
index 0000000..29b6854
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"नजिकका स्थानहरू"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml
new file mode 100644
index 0000000..1d4d472
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"ਨਜ਼ਦੀਕੀ ਸਥਾਨ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml
new file mode 100644
index 0000000..c00b608
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Miejsca w pobliżu"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml
new file mode 100644
index 0000000..21af043
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Оближња места"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml
new file mode 100644
index 0000000..c309b8d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Platser i närheten"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml
new file mode 100644
index 0000000..ce7496e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"அருகிலுள்ள இடங்கள்"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml
new file mode 100644
index 0000000..c8229fb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"సమీప స్థలాలు"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml
new file mode 100644
index 0000000..1167d2f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"สถานที่ใกล้เคียง"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml
new file mode 100644
index 0000000..a3936be
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Місця поблизу"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml
new file mode 100644
index 0000000..1a220b3
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"قریبی مقامات"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..e060cb5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"附近的地点"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..5cdf5b9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml
@@ -0,0 +1,21 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"附近地點"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml
new file mode 100644
index 0000000..8039ea0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for nearby_places (275117539511113867) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/notification/res/values/ids.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values/strings.xml
similarity index 60%
rename from java/com/android/dialer/notification/res/values/ids.xml
rename to java/com/android/dialer/searchfragment/nearbyplaces/res/values/strings.xml
index c965f31..ed80680 100644
--- a/java/com/android/dialer/notification/res/values/ids.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values/strings.xml
@@ -14,14 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-
 <resources>
-  <item name="notification_ongoing_call" type="id"/>
-  <item name="notification_missed_call" type="id"/>
-  <item name="notification_visual_voicemail" type="id"/>
-  <item name="notification_legacy_voicemail" type="id"/>
-  <item name="notification_external_call" type="id"/>
-  <item name="notification_call_blocking_disabled_by_emergency_call" type="id"/>
-  <item name="notification_spam_call" type="id"/>
-  <item name="notification_feedback" type="id"/>
-</resources>
+  <!-- Label for a list of local search results [CHAR LIMIT=30]-->
+  <string name="nearby_places">Nearby places</string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/shortcuts/Shortcuts.java b/java/com/android/dialer/shortcuts/Shortcuts.java
index b6a7fa8..c2bbb4d 100644
--- a/java/com/android/dialer/shortcuts/Shortcuts.java
+++ b/java/com/android/dialer/shortcuts/Shortcuts.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 
 /** Checks if dynamic shortcuts should be enabled. */
 public class Shortcuts {
diff --git a/java/com/android/dialer/simulator/impl/SimulatorContacts.java b/java/com/android/dialer/simulator/impl/SimulatorContacts.java
index c5e25b3..e77788f 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorContacts.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorContacts.java
@@ -134,7 +134,7 @@
         ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
             .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, contact.getAccountType())
             .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, contact.getAccountName())
-            .withValue(ContactsContract.RawContacts.STARRED, contact.getIsStarred())
+            .withValue(ContactsContract.RawContacts.STARRED, contact.getIsStarred() ? 1 : 0)
             .withYieldAllowed(true)
             .build());
 
diff --git a/java/com/android/dialer/telecom/TelecomUtil.java b/java/com/android/dialer/telecom/TelecomUtil.java
index 82b4383..573bfe2 100644
--- a/java/com/android/dialer/telecom/TelecomUtil.java
+++ b/java/com/android/dialer/telecom/TelecomUtil.java
@@ -29,9 +29,12 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.text.TextUtils;
+import android.util.Pair;
 import com.android.dialer.common.LogUtil;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Performs permission checks before calling into TelecomManager. Each method is self-explanatory -
@@ -45,6 +48,14 @@
 
   private static TelecomUtilImpl instance = new TelecomUtilImpl();
 
+  /**
+   * Cache for {@link #isVoicemailNumber(Context, PhoneAccountHandle, String)}. Both
+   * PhoneAccountHandle and number are cached because multiple numbers might be mapped to true, and
+   * comparing with {@link #getVoicemailNumber(Context, PhoneAccountHandle)} will not suffice.
+   */
+  private static final Map<Pair<PhoneAccountHandle, String>, Boolean> isVoicemailNumberCache =
+      new ConcurrentHashMap<>();
+
   @VisibleForTesting(otherwise = VisibleForTesting.NONE)
   public static void setInstanceForTesting(TelecomUtilImpl instanceForTesting) {
     instance = instanceForTesting;
@@ -133,12 +144,27 @@
     return instance.isInCall(context);
   }
 
+  /**
+   * {@link TelecomManager#isVoiceMailNumber(PhoneAccountHandle, String)} takes about 10ms, which is
+   * way too slow for regular purposes. This method will cache the result for the life time of the
+   * process. The cache will not be invalidated, for example, if the voicemail number is changed by
+   * setting up apps like Google Voicemail, the result will be wrong. These events are rare.
+   */
   public static boolean isVoicemailNumber(
       Context context, PhoneAccountHandle accountHandle, String number) {
-    if (hasReadPhoneStatePermission(context)) {
-      return getTelecomManager(context).isVoiceMailNumber(accountHandle, number);
+    if (TextUtils.isEmpty(number)) {
+      return false;
     }
-    return false;
+    Pair<PhoneAccountHandle, String> cacheKey = new Pair<>(accountHandle, number);
+    if (isVoicemailNumberCache.containsKey(cacheKey)) {
+      return isVoicemailNumberCache.get(cacheKey);
+    }
+    boolean result = false;
+    if (hasReadPhoneStatePermission(context)) {
+      result = getTelecomManager(context).isVoiceMailNumber(accountHandle, number);
+    }
+    isVoicemailNumberCache.put(cacheKey, result);
+    return result;
   }
 
   @Nullable
diff --git a/java/com/android/dialer/util/CallUtil.java b/java/com/android/dialer/util/CallUtil.java
index b6ab3b3..0afe930 100644
--- a/java/com/android/dialer/util/CallUtil.java
+++ b/java/com/android/dialer/util/CallUtil.java
@@ -122,7 +122,7 @@
       cachedIsVideoEnabledState = isVideoEnabled;
     }
 
-    return true;
+    return isVideoEnabled;
   }
 
   /**
diff --git a/java/com/android/dialer/util/PermissionsUtil.java b/java/com/android/dialer/util/PermissionsUtil.java
index 72a59ea..3482831 100644
--- a/java/com/android/dialer/util/PermissionsUtil.java
+++ b/java/com/android/dialer/util/PermissionsUtil.java
@@ -16,15 +16,33 @@
 
 package com.android.dialer.util;
 
+import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static android.Manifest.permission.ADD_VOICEMAIL;
+import static android.Manifest.permission.CALL_PHONE;
+import static android.Manifest.permission.MODIFY_PHONE_STATE;
+import static android.Manifest.permission.READ_CALL_LOG;
+import static android.Manifest.permission.READ_CONTACTS;
+import static android.Manifest.permission.READ_PHONE_STATE;
+import static android.Manifest.permission.READ_VOICEMAIL;
+import static android.Manifest.permission.WRITE_CALL_LOG;
+import static android.Manifest.permission.WRITE_CONTACTS;
+import static android.Manifest.permission.WRITE_VOICEMAIL;
+
 import android.Manifest.permission;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
 import com.android.dialer.common.LogUtil;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /** Utility class to help with runtime permissions. */
 public class PermissionsUtil {
@@ -32,6 +50,27 @@
   private static final String PERMISSION_PREFERENCE = "dialer_permissions";
   private static final String CEQUINT_PERMISSION = "com.cequint.ecid.CALLER_ID_LOOKUP";
 
+  // Permissions list retrieved from application manifest.
+  // Starting in Android O Permissions must be explicitly enumerated:
+  // https://developer.android.com/preview/behavior-changes.html#rmp
+  public static final List<String> allPhoneGroupPermissionsUsedInDialer =
+      Collections.unmodifiableList(
+          Arrays.asList(
+              READ_CALL_LOG,
+              WRITE_CALL_LOG,
+              READ_PHONE_STATE,
+              MODIFY_PHONE_STATE,
+              CALL_PHONE,
+              ADD_VOICEMAIL,
+              WRITE_VOICEMAIL,
+              READ_VOICEMAIL));
+
+  public static final List<String> allContactsGroupPermissionsUsedInDialer =
+      Collections.unmodifiableList(Arrays.asList(READ_CONTACTS, WRITE_CONTACTS));
+
+  public static final List<String> allLocationGroupPermissionsUsedInDialer =
+      Collections.unmodifiableList(Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION));
+
   public static boolean hasPhonePermissions(Context context) {
     return hasPermission(context, permission.CALL_PHONE);
   }
@@ -72,15 +111,15 @@
     return hasPermission(context, permission.WRITE_VOICEMAIL);
   }
 
+  public static boolean hasAddVoicemailPermissions(Context context) {
+    return hasPermission(context, permission.ADD_VOICEMAIL);
+  }
+
   public static boolean hasPermission(Context context, String permission) {
     return ContextCompat.checkSelfPermission(context, permission)
         == PackageManager.PERMISSION_GRANTED;
   }
 
-  public static boolean hasAddVoicemailPermissions(Context context) {
-    return hasPermission(context, permission.ADD_VOICEMAIL);
-  }
-
   /**
    * Checks {@link android.content.SharedPreferences} if a permission has been requested before.
    *
@@ -147,4 +186,25 @@
     final Intent intent = new Intent(permission);
     LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
   }
+
+  /**
+   * Returns a list of permissions currently not granted to the application from the supplied list.
+   *
+   * @param context - The Application context.
+   * @param permissionsList - A list of permissions to check if the current application has been
+   *     granted.
+   * @return An array of permissions that are currently DENIED to the application; a subset of
+   *     permissionsList.
+   */
+  @NonNull
+  public static String[] getPermissionsCurrentlyDenied(
+      @NonNull Context context, @NonNull List<String> permissionsList) {
+    List<String> permissionsCurrentlyDenied = new ArrayList<>();
+    for (String permission : permissionsList) {
+      if (!hasPermission(context, permission)) {
+        permissionsCurrentlyDenied.add(permission);
+      }
+    }
+    return permissionsCurrentlyDenied.toArray(new String[permissionsCurrentlyDenied.size()]);
+  }
 }
diff --git a/java/com/android/incallui/incall/impl/LockableViewPager.java b/java/com/android/dialer/widget/LockableViewPager.java
similarity index 92%
rename from java/com/android/incallui/incall/impl/LockableViewPager.java
rename to java/com/android/dialer/widget/LockableViewPager.java
index 5b8b126..b5d4022 100644
--- a/java/com/android/incallui/incall/impl/LockableViewPager.java
+++ b/java/com/android/dialer/widget/LockableViewPager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.incallui.incall.impl;
+package com.android.dialer.widget;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
@@ -34,6 +34,10 @@
     this.swipingLocked = swipingLocked;
   }
 
+  public boolean isSwipingLocked() {
+    return swipingLocked;
+  }
+
   @Override
   public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
     return !swipingLocked && super.onInterceptTouchEvent(motionEvent);
diff --git a/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml b/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml
new file mode 100644
index 0000000..00344bf
--- /dev/null
+++ b/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+  <ImageView
+      android:id="@+id/empty_list_view_image"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="1"
+      android:maxHeight="126dp"
+      android:gravity="center_horizontal"/>
+
+  <TextView
+      android:id="@+id/empty_list_view_message"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingTop="8dp"
+      android:paddingBottom="8dp"
+      android:paddingLeft="16dp"
+      android:paddingRight="16dp"
+      android:gravity="center_horizontal|top"
+      android:textColor="@color/empty_list_text_color"
+      android:textSize="@dimen/empty_list_message_text_size"/>
+
+  <TextView
+      android:id="@+id/empty_list_view_action"
+      style="@style/TextActionStyle"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_horizontal"
+      android:paddingTop="8dp"
+      android:paddingBottom="8dp"
+      android:paddingLeft="16dp"
+      android:paddingRight="16dp"
+      android:background="?android:attr/selectableItemBackground"
+      android:clickable="true"
+      android:gravity="center_horizontal"/>
+
+  <Space
+      android:layout_width="match_parent"
+      android:layout_height="40dp"/>
+
+</merge>
diff --git a/java/com/android/dialer/widget/res/values-af/strings.xml b/java/com/android/dialer/widget/res/values-af/strings.xml
index 122c843..0c21ae9 100644
--- a/java/com/android/dialer/widget/res/values-af/strings.xml
+++ b/java/com/android/dialer/widget/res/values-af/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skryf \'n gepasmaakte boodskap"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Maak toe"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Jy het nog nie enige kontakte nie"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Voeg \'n kontak by"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Skep nuwe kontak"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Skakel aan"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Skakel die kontaktetoestemming aan om jou kontakte te sien."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Geen kontakte-program beskikbaar nie"</string>
diff --git a/java/com/android/dialer/widget/res/values-am/strings.xml b/java/com/android/dialer/widget/res/values-am/strings.xml
index 8a5353e..3952e83 100644
--- a/java/com/android/dialer/widget/res/values-am/strings.xml
+++ b/java/com/android/dialer/widget/res/values-am/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ብጁ መልዕክት ይጻፉ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ዝጋ"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"ገና ምንም እውቂያዎች የሉዎትም"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"እውቂያ ያክሉ"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"አብራ"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"የእርስዎን እውቂያዎች ለማየት፣ የእውቂያዎች ፍቃዱን ያብሩ።"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"ምንም የእውቂያዎች መተግበሪያ አይገኝም"</string>
diff --git a/java/com/android/dialer/widget/res/values-ar/strings.xml b/java/com/android/dialer/widget/res/values-ar/strings.xml
index 7947903..26ed748 100644
--- a/java/com/android/dialer/widget/res/values-ar/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ar/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"كتابة رسالة مخصصة"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"إغلاق"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"ليست لديك أية جهات اتصال حتى الآن"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"إضافة جهة اتصال"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"إنشاء جهة اتصال"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"تشغيل"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"للاطلاع على جهات الاتصال، شغِّل إذن جهات الاتصال."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"لا يتوفر تطبيق لجهات الاتصال"</string>
diff --git a/java/com/android/dialer/widget/res/values-az/strings.xml b/java/com/android/dialer/widget/res/values-az/strings.xml
index 7a1389a..cb40af6 100644
--- a/java/com/android/dialer/widget/res/values-az/strings.xml
+++ b/java/com/android/dialer/widget/res/values-az/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Fərdi mesaj yazın"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Bağlayın"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Hələ heç bir kontakt yoxdur"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Kontakt əlavə edin"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktiv edin"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktları görmək üçün Kontakt icazəsini aktiv edin."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Kontakt tətbiqi əlçatan deyil"</string>
diff --git a/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml
index 46b29d2..fea3cb0 100644
--- a/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napišite prilagođenu poruku"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zatvorite"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Još uvek nemate nijedan kontakt"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Dodaj kontakt"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Napravi novi kontakt"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Uključi"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Da biste videli kontakte, uključite dozvolu za Kontakte."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nema dostupne aplikacije za kontakte"</string>
diff --git a/java/com/android/dialer/widget/res/values-be/strings.xml b/java/com/android/dialer/widget/res/values-be/strings.xml
index 38c8a80..6805984 100644
--- a/java/com/android/dialer/widget/res/values-be/strings.xml
+++ b/java/com/android/dialer/widget/res/values-be/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Напісаць карыстальніцкае паведамленне"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Закрыць"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"У вас пакуль няма ніякіх кантактаў"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Дадаць кантакт"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Уключыць"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Каб бачыць свае кантакты, уключыце дазвол для Кантактаў."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Праграмы для аперацый з кантактамі няма"</string>
diff --git a/java/com/android/dialer/widget/res/values-bg/strings.xml b/java/com/android/dialer/widget/res/values-bg/strings.xml
index 00ce564..fbb87d0 100644
--- a/java/com/android/dialer/widget/res/values-bg/strings.xml
+++ b/java/com/android/dialer/widget/res/values-bg/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Напишете свое съобщение"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Затваряне"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Още нямате контакти"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Добавяне на контакт"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Създаване на нов контакт"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Включване"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"За да видите контактите си, включете разрешението за Контакти."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Няма налично приложение за контакти"</string>
diff --git a/java/com/android/dialer/widget/res/values-bn/strings.xml b/java/com/android/dialer/widget/res/values-bn/strings.xml
index 96b75db..58bf44c 100644
--- a/java/com/android/dialer/widget/res/values-bn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-bn/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"একটি কাস্টম বার্তা লিখুন"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"বন্ধ করুন"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"আপনার এখনও পর্যন্ত কোনো পরিচিতি নেই"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"একটি পরিচিতি যোগ করুন"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"নতুন পরিচিতি তৈরি করুন"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"চালু করুন"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"আপনার পরিচিতিগুলি দেখতে, পরিচিতিগুলির অনুমতি চালু করুন।"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"কোনো পরিচিতি অ্যাপ্লিকেশান উপলব্ধ নয়"</string>
diff --git a/java/com/android/dialer/widget/res/values-bs/strings.xml b/java/com/android/dialer/widget/res/values-bs/strings.xml
index df24ee1..239c074 100644
--- a/java/com/android/dialer/widget/res/values-bs/strings.xml
+++ b/java/com/android/dialer/widget/res/values-bs/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napišite prilagođenu poruku"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zatvori"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Još nemate nijedan kontakt"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Dodajte kontakt"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Kreirajte novi kontakt"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Uključi"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Da vidite kontakte, uključite dozvolu za Kontakte."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nije dostupna nijedna aplikacija za kontakte"</string>
diff --git a/java/com/android/dialer/widget/res/values-ca/strings.xml b/java/com/android/dialer/widget/res/values-ca/strings.xml
index f7bbaa7..8f01cb5 100644
--- a/java/com/android/dialer/widget/res/values-ca/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ca/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escriu un miss. personalitzat"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Tanca"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Encara no tens cap contacte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Afegeix un contacte"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Activa"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Activa el permís Contactes per veure els teus contactes."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"No hi ha cap contacte disponible"</string>
diff --git a/java/com/android/dialer/widget/res/values-cs/strings.xml b/java/com/android/dialer/widget/res/values-cs/strings.xml
index 19e5d17..ee8d140 100644
--- a/java/com/android/dialer/widget/res/values-cs/strings.xml
+++ b/java/com/android/dialer/widget/res/values-cs/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napište vlastní zprávu"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zavřít"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Zatím nemáte žádné kontakty"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Přidat kontakt"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Povolit"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Pokud chcete zobrazit kontakty, povolte aplikaci přístup ke Kontaktům."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Není k dispozici žádná aplikace pro práci s kontakty"</string>
diff --git a/java/com/android/dialer/widget/res/values-da/strings.xml b/java/com/android/dialer/widget/res/values-da/strings.xml
index 67fb244..0e44948 100644
--- a/java/com/android/dialer/widget/res/values-da/strings.xml
+++ b/java/com/android/dialer/widget/res/values-da/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skriv en tilpasset besked"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Luk"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Du har endnu ikke nogen kontaktpersoner"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Tilføj en kontaktperson"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Slå til"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Slå tilladelsen Kontaktpersoner til for at se dine kontaktpersoner."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Der er ingen tilgængelig app til kontaktpersoner"</string>
diff --git a/java/com/android/dialer/widget/res/values-de/strings.xml b/java/com/android/dialer/widget/res/values-de/strings.xml
index 14146d6..f650df9 100644
--- a/java/com/android/dialer/widget/res/values-de/strings.xml
+++ b/java/com/android/dialer/widget/res/values-de/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Eigene Nachricht schreiben"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Schließen"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Du hast noch keine Kontakte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Kontakt hinzufügen"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Neuen Kontakt erstellen"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktivieren"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Aktiviere die Berechtigung \"Kontakte\", um deine Kontakte abzurufen."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Keine Kontakte-App verfügbar"</string>
diff --git a/java/com/android/dialer/widget/res/values-el/strings.xml b/java/com/android/dialer/widget/res/values-el/strings.xml
index 0db6b26..849fd6a 100644
--- a/java/com/android/dialer/widget/res/values-el/strings.xml
+++ b/java/com/android/dialer/widget/res/values-el/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Γράψτε ένα προσαρμ. μήνυμα"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Κλείσιμο"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Δεν έχετε επαφές ακόμη"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Προσθήκη επαφής"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Ενεργοποίηση"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Για να δείτε τις επαφές σας, ενεργοποιήστε την άδεια πρόσβασης στις Επαφές."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Δεν υπάρχει διαθέσιμη εφαρμογή επαφών"</string>
diff --git a/java/com/android/dialer/widget/res/values-en-rAU/strings.xml b/java/com/android/dialer/widget/res/values-en-rAU/strings.xml
index a87cd28..33cba33 100644
--- a/java/com/android/dialer/widget/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/widget/res/values-en-rAU/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Write a custom message"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Close"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"You don\'t have any contacts yet"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Add a contact"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Create new contact"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Turn on"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"To see your contacts, turn on the Contacts permission."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"No contacts app available"</string>
diff --git a/java/com/android/dialer/widget/res/values-en-rGB/strings.xml b/java/com/android/dialer/widget/res/values-en-rGB/strings.xml
index a87cd28..33cba33 100644
--- a/java/com/android/dialer/widget/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/widget/res/values-en-rGB/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Write a custom message"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Close"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"You don\'t have any contacts yet"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Add a contact"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Create new contact"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Turn on"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"To see your contacts, turn on the Contacts permission."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"No contacts app available"</string>
diff --git a/java/com/android/dialer/widget/res/values-en-rIN/strings.xml b/java/com/android/dialer/widget/res/values-en-rIN/strings.xml
index a87cd28..33cba33 100644
--- a/java/com/android/dialer/widget/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/widget/res/values-en-rIN/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Write a custom message"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Close"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"You don\'t have any contacts yet"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Add a contact"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Create new contact"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Turn on"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"To see your contacts, turn on the Contacts permission."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"No contacts app available"</string>
diff --git a/java/com/android/dialer/widget/res/values-es-rUS/strings.xml b/java/com/android/dialer/widget/res/values-es-rUS/strings.xml
index 5ecc22b..8c257b2 100644
--- a/java/com/android/dialer/widget/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/widget/res/values-es-rUS/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escribe tu propio mensaje"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Cerrar"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Aún no tienes contactos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Agregar un contacto"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Activar"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver los contactos, activa el permiso Contactos."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"No hay ninguna app de contactos disponible"</string>
diff --git a/java/com/android/dialer/widget/res/values-es/strings.xml b/java/com/android/dialer/widget/res/values-es/strings.xml
index e561d06..dcb695e 100644
--- a/java/com/android/dialer/widget/res/values-es/strings.xml
+++ b/java/com/android/dialer/widget/res/values-es/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Mensaje personalizado"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Cerrar"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Aún no tienes contactos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Añadir un contacto"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crear un contacto"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Activar"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver tus contactos, activa el permiso de Contactos."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"No hay aplicaciones de contactos disponibles"</string>
diff --git a/java/com/android/dialer/widget/res/values-et/strings.xml b/java/com/android/dialer/widget/res/values-et/strings.xml
index 054b422..f7357c2 100644
--- a/java/com/android/dialer/widget/res/values-et/strings.xml
+++ b/java/com/android/dialer/widget/res/values-et/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Kirjutage kohandatud sõnum"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Sule"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Teil pole veel kontakte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Kontakti lisamine"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Lülita sisse"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktide vaatamiseks lülitage sisse kontaktide luba."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Kontaktide rakendus pole saadaval"</string>
diff --git a/java/com/android/dialer/widget/res/values-eu/strings.xml b/java/com/android/dialer/widget/res/values-eu/strings.xml
index 7d19192..f4d0d1d 100644
--- a/java/com/android/dialer/widget/res/values-eu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-eu/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Idatzi mezu bat"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Itxi"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Oraindik ez duzu kontakturik"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Gehitu kontaktu bat"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktibatu"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktuak ikusteko, aktibatu Kontaktuak atzitzeko baimena."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Ez dago kontaktu-aplikaziorik erabilgarri"</string>
diff --git a/java/com/android/dialer/widget/res/values-fa/strings.xml b/java/com/android/dialer/widget/res/values-fa/strings.xml
index 5ed2313..9168ac2 100644
--- a/java/com/android/dialer/widget/res/values-fa/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fa/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"پیام سفارشی بنویسید"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"بستن"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"هنوز هیچ مخاطبی ندارید"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"افزودن مخاطب"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"فعال‌سازی"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"برای دیدن مخاطبینتان، مجوز «مخاطبین» را روشن کنید."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"هیچ برنامه مخاطبی در دسترس نیست"</string>
diff --git a/java/com/android/dialer/widget/res/values-fi/strings.xml b/java/com/android/dialer/widget/res/values-fi/strings.xml
index 1a15307..80f1902 100644
--- a/java/com/android/dialer/widget/res/values-fi/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fi/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Kirjoita oma viesti"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Sulje"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Sinulla ei ole vielä yhteystietoja."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Lisää yhteystieto."</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Ota käyttöön"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Jos haluat katsella yhteystietojasi, ota Yhteystiedot-käyttöoikeus käyttöön."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Yhteystietosovellusta ei ole käytettävissä."</string>
diff --git a/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml b/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml
index 62e1f37..7785509 100644
--- a/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Rédiger message personnalisé"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Fermer"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Vous n\'avez pas encore de contacts"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Ajouter un contact"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Créer un contact"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Activer"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Pour consulter vos contacts, activez l\'autorisation Contacts."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Aucune application Contacts n\'est disponible"</string>
diff --git a/java/com/android/dialer/widget/res/values-fr/strings.xml b/java/com/android/dialer/widget/res/values-fr/strings.xml
index 85a32b8..be8810f 100644
--- a/java/com/android/dialer/widget/res/values-fr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fr/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Écrire mon propre message"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Fermer"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Vous n\'avez pas encore de contacts."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Ajouter un contact"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Créer un contact"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Activer"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Pour consulter vos contacts, activez l\'autorisation Contacts."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Aucune application de gestion des contacts n\'est disponible"</string>
diff --git a/java/com/android/dialer/widget/res/values-gl/strings.xml b/java/com/android/dialer/widget/res/values-gl/strings.xml
index 8a9089f..a519e68 100644
--- a/java/com/android/dialer/widget/res/values-gl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-gl/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escribe unha mensaxe personalizada"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Pechar"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Aínda non tes ningún contacto"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Engadir un contacto"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crear novo contacto"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Activar"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver os teus contactos, activa o permiso de Contactos."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Non hai ningunha aplicación de contactos dispoñible"</string>
diff --git a/java/com/android/dialer/widget/res/values-gu/strings.xml b/java/com/android/dialer/widget/res/values-gu/strings.xml
index 794245d..81e6f10 100644
--- a/java/com/android/dialer/widget/res/values-gu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-gu/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"એક કસ્ટમ સંદેશ લખો"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"બંધ કરો"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"તમે હજી સુધી કોઇપણ સંપર્કો ધરાવતાં નથી"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"સંપર્ક ઉમેરો"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"નવો સંપર્ક બનાવો"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"ચાલુ કરો"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"તમારા સંપર્કો જોવા માટે, સંપર્કોની પરવાનગી ચાલુ કરો."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"કોઈ સંપર્કો ઍપ્લિકેશન ઉપલબ્ધ નથી"</string>
diff --git a/java/com/android/dialer/widget/res/values-hi/strings.xml b/java/com/android/dialer/widget/res/values-hi/strings.xml
index 5cdb8bb..622cdca 100644
--- a/java/com/android/dialer/widget/res/values-hi/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hi/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"कोई कस्टम संदेश लिखें"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"बंद करें"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"आपके पास अभी कोई भी संपर्क नहीं है"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"कोई संपर्क जोड़ें"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"नया संपर्क बनाएं"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"चालू करें"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"अपने संपर्क देखने के लिए, संपर्क अनुमति चालू करें."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"कोई भी संपर्क ऐप उपलब्‍ध नहीं है"</string>
diff --git a/java/com/android/dialer/widget/res/values-hr/strings.xml b/java/com/android/dialer/widget/res/values-hr/strings.xml
index 9ded4d4..7254bc0 100644
--- a/java/com/android/dialer/widget/res/values-hr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hr/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napišite prilagođenu poruku"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zatvaranje"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Još nemate nijedan kontakt"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Dodavanje kontakta"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Uključi"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Da biste vidjeli svoje kontakte, uključite dopuštenje za kontakte."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nije dostupna nijedna aplikacija za kontakte"</string>
diff --git a/java/com/android/dialer/widget/res/values-hu/strings.xml b/java/com/android/dialer/widget/res/values-hu/strings.xml
index 92ae71d..5301d69 100644
--- a/java/com/android/dialer/widget/res/values-hu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hu/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Egyéni üzenet írása"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Bezárás"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Még nem rendelkezik egyetlen névjeggyel sem"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Névjegy hozzáadása"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Bekapcsolás"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"A névjegyek megtekintéséhez kapcsolja be a Névjegyek engedélyt."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nincs elérhető névjegykezelő alkalmazás"</string>
diff --git a/java/com/android/dialer/widget/res/values-hy/strings.xml b/java/com/android/dialer/widget/res/values-hy/strings.xml
index ffa7132..95d0b73 100644
--- a/java/com/android/dialer/widget/res/values-hy/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hy/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Գրել տեքստն ինքնուրույն"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Փակել"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Դեռ կոնտակտներ չունեք"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Ավելացնել կոնտակտ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Ստեղծել նոր կոնտակտ"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Միացնել"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Ձեր կոնտակտները տեսնելու համար միացրեք Կոնտակտների թույլտվությունը:"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Կոնտակտների հավելված չկա"</string>
diff --git a/java/com/android/dialer/widget/res/values-in/strings.xml b/java/com/android/dialer/widget/res/values-in/strings.xml
index 69849ae..98dfe7b 100644
--- a/java/com/android/dialer/widget/res/values-in/strings.xml
+++ b/java/com/android/dialer/widget/res/values-in/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Tulis pesan khusus"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Tutup"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Anda belum memiliki kontak"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Tambahkan kontak"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktifkan"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Untuk melihat kontak, aktifkan izin Kontak."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Aplikasi kontak tidak tersedia"</string>
diff --git a/java/com/android/dialer/widget/res/values-is/strings.xml b/java/com/android/dialer/widget/res/values-is/strings.xml
index 98a1729..22485aa 100644
--- a/java/com/android/dialer/widget/res/values-is/strings.xml
+++ b/java/com/android/dialer/widget/res/values-is/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skrifa sérsniðin skilaboð"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Loka"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Þú ert ekki með neina tengiliði enn sem komið er"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Bæta tengilið við"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Kveikja"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Kveiktu á tengiliðaheimildinni til að sjá tengiliðina þína."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Ekkert tengiliðaforrit í boði"</string>
diff --git a/java/com/android/dialer/widget/res/values-it/strings.xml b/java/com/android/dialer/widget/res/values-it/strings.xml
index 1a6e6c1..059a7d6 100644
--- a/java/com/android/dialer/widget/res/values-it/strings.xml
+++ b/java/com/android/dialer/widget/res/values-it/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Scrivi un messaggio personalizzato"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Chiudi"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Nessun contatto disponibile"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Aggiungi un contatto"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Attiva"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Per accedere ai tuoi contatti, attiva l\'autorizzazione Contatti."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nessuna app di contatti disponibile"</string>
diff --git a/java/com/android/dialer/widget/res/values-iw/strings.xml b/java/com/android/dialer/widget/res/values-iw/strings.xml
index f2a732a..48bf219 100644
--- a/java/com/android/dialer/widget/res/values-iw/strings.xml
+++ b/java/com/android/dialer/widget/res/values-iw/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"כתוב הודעה מותאמת אישית"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"סגירה"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"עדיין אין לך אנשי קשר"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"הוספה של איש קשר"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"איש קשר חדש"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"הפעלה"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"עליך להפעיל את ההרשאה \'אנשי קשר\' כדי להציג את אנשי הקשר שלך."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"אין אף אפליקציה לניהול אנשי קשר"</string>
diff --git a/java/com/android/dialer/widget/res/values-ja/strings.xml b/java/com/android/dialer/widget/res/values-ja/strings.xml
index 7994c62..969ffba 100644
--- a/java/com/android/dialer/widget/res/values-ja/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ja/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"カスタム メッセージを入力"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"閉じる"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"連絡先はまだありません"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"連絡先を追加"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"ON にする"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"連絡先を表示するには、連絡先へのアクセスを許可する設定を ON にしてください。"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"利用できる連絡先アプリがありません"</string>
diff --git a/java/com/android/dialer/widget/res/values-ka/strings.xml b/java/com/android/dialer/widget/res/values-ka/strings.xml
index 865a66b..fcd4543 100644
--- a/java/com/android/dialer/widget/res/values-ka/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ka/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"დაწერეთ მორგებ. შეტყობინება"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"დახურვა"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"კონტაქტები ჯერ არ გაქვთ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"კონტაქტის დამატება"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"ჩართვა"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"კონტაქტების სანახავად ჩართეთ კონტაქტების ნებართვა."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"კონტაქტების აპი მიუწვდომელია"</string>
diff --git a/java/com/android/dialer/widget/res/values-kk/strings.xml b/java/com/android/dialer/widget/res/values-kk/strings.xml
index 08856aa..cab8271 100644
--- a/java/com/android/dialer/widget/res/values-kk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-kk/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Арнаулы хабар жазу"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Жабу"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Әлі ешқандай контактілер жоқ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Контакт қосу"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Қосу"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Контактілерді көру үшін \"Контактілер\" рұқсатын қосыңыз."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Контактілер қолданбасы қолжетімді емес"</string>
diff --git a/java/com/android/dialer/widget/res/values-km/strings.xml b/java/com/android/dialer/widget/res/values-km/strings.xml
index c092332..2d6f2f2 100644
--- a/java/com/android/dialer/widget/res/values-km/strings.xml
+++ b/java/com/android/dialer/widget/res/values-km/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"សរសេរ​សារ​ផ្ទាល់ខ្លួន"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"បិទ"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"អ្នកមិនទាន់មានទំនាក់ទំនងនៅឡើយទេ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"បញ្ចូល​ទំនាក់ទំនង"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"បើក"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"ដើម្បីមើលទំនាក់ទំនងរបស់អ្នក សូមបើកការ​អនុញ្ញាតកម្មវិធីទំនាក់ទំនង។"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"មិនមានកម្មវិធីទំនាក់ទំនងទេ"</string>
diff --git a/java/com/android/dialer/widget/res/values-kn/strings.xml b/java/com/android/dialer/widget/res/values-kn/strings.xml
index a502d08..d449cb8 100644
--- a/java/com/android/dialer/widget/res/values-kn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-kn/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ಕಸ್ಟಮ್ ಸಂದೇಶವನ್ನು ಬರೆಯಿರಿ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ಮುಚ್ಚಿ"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"ನಿಮ್ಮ ಬಳಿ ಇನ್ನೂ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"ಸಂಪರ್ಕ ಸೇರಿಸಿ"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"ಆನ್ ಮಾಡಿ"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ವೀಕ್ಷಿಸಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"ಯಾವುದೇ ಸಂಪರ್ಕಗಳ ಅಪ್ಲಿಕೇಶನ್‌ ಲಭ್ಯವಿಲ್ಲ"</string>
diff --git a/java/com/android/dialer/widget/res/values-ko/strings.xml b/java/com/android/dialer/widget/res/values-ko/strings.xml
index 045dc54..0827d36 100644
--- a/java/com/android/dialer/widget/res/values-ko/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ko/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"맞춤 메시지를 작성하세요."</string>
     <string name="toolbar_close" msgid="1081308076149879833">"닫기"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"아직 연락처가 없습니다."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"연락처 추가"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"새 연락처 만들기"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"사용"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"연락처를 보려면 연락처에 액세스할 권한을 부여하세요."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"사용할 수 있는 연락처 앱이 없습니다."</string>
diff --git a/java/com/android/dialer/widget/res/values-ky/strings.xml b/java/com/android/dialer/widget/res/values-ky/strings.xml
index 7ef10e7..62bd088 100644
--- a/java/com/android/dialer/widget/res/values-ky/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ky/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Башка билдирүүнү жазыңыз"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Жабуу"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Азырынча эч байланышыңыз жок"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Байланыш кошуу"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Күйгүзүү"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Байланыштарыңызды көрүү үчүн, \"Байланыштар\" уруксатын күйгүзүңүз."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Жеткиликтүү байланыштар колдонмосу жок"</string>
diff --git a/java/com/android/dialer/widget/res/values-lo/strings.xml b/java/com/android/dialer/widget/res/values-lo/strings.xml
index dc7ba44..8b7e476 100644
--- a/java/com/android/dialer/widget/res/values-lo/strings.xml
+++ b/java/com/android/dialer/widget/res/values-lo/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ຂຽນຂໍ້ຄວາມດ້ວຍຕົນເອງ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ປິດ"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"ທ່ານຍັງບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ເທື່ອ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"ເພີ່ມລາຍຊື່"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"ເປີດໃຊ້"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"ເພື່ອເບິ່ງລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງທ່ານ, ໃຫ້ເປີດການອະນຸຍາດລາຍຊື່ຜູ້ຕິດຕໍ່ກ່ອນ"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"ບໍ່ມີແອັບລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ສາມາດໃຊ້ໄດ້"</string>
diff --git a/java/com/android/dialer/widget/res/values-lt/strings.xml b/java/com/android/dialer/widget/res/values-lt/strings.xml
index be12520..30cc0ad 100644
--- a/java/com/android/dialer/widget/res/values-lt/strings.xml
+++ b/java/com/android/dialer/widget/res/values-lt/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Parašykite tinkintą praneš."</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Uždaryti"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Dar neturite jokių kontaktų"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Pridėkite kontaktą"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Sukurti naują kontaktą"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Įjungti"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Jei norite peržiūrėti kontaktus, įjunkite Kontaktų leidimą."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nepasiekiama jokia kontaktų programa"</string>
diff --git a/java/com/android/dialer/widget/res/values-lv/strings.xml b/java/com/android/dialer/widget/res/values-lv/strings.xml
index acefbae..87464c5 100644
--- a/java/com/android/dialer/widget/res/values-lv/strings.xml
+++ b/java/com/android/dialer/widget/res/values-lv/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Rakstīt pielāgotu ziņojumu"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Aizvērt"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Jums vēl nav nevienas kontaktpersonas."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Pievienot kontaktpersonu"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Ieslēgt"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Lai skatītu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nav pieejama neviena kontaktpersonu lietotne."</string>
diff --git a/java/com/android/dialer/widget/res/values-mk/strings.xml b/java/com/android/dialer/widget/res/values-mk/strings.xml
index 20b18e8..cd2f86b 100644
--- a/java/com/android/dialer/widget/res/values-mk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-mk/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Напиши приспособена порака"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Затвори"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Сè уште немате контакти"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Додајте контакт"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Вклучи"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"За да ги видите контактите, вклучете ја дозволата за контакти."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Нема достапна апликација за контакти"</string>
diff --git a/java/com/android/dialer/widget/res/values-ml/strings.xml b/java/com/android/dialer/widget/res/values-ml/strings.xml
index a97a7d8..1799755 100644
--- a/java/com/android/dialer/widget/res/values-ml/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ml/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ഒരു ഇ‌ഷ്‌ടാനുസൃത സന്ദേശം രചിക്കൂ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"അടയ്‌ക്കുക"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"നിങ്ങൾക്ക് ഇതുവരെയും കോൺടാക്റ്റുകൾ ഒന്നുമില്ല."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"ഒരു കോണ്‍ടാക്റ്റ് ചേര്‍ക്കുക"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"ഓൺ ചെയ്യുക"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"നിങ്ങളുടെ കോൺടാക്റ്റുകൾ കാണുന്നതിന്, \'കോൺടാക്റ്റുകൾ\' അനുമതി ഓണാക്കുക."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"കോൺടാക്റ്റ് അപ്ലിക്കേഷനൊന്നും ലഭ്യമല്ല"</string>
diff --git a/java/com/android/dialer/widget/res/values-mn/strings.xml b/java/com/android/dialer/widget/res/values-mn/strings.xml
index bbcfc7c..e5f5c21 100644
--- a/java/com/android/dialer/widget/res/values-mn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-mn/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Тусгай зурвас бичих"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Хаах"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Танд одоогоор харилцагч байхгүй байна"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Харилцагч нэмэх"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Шинэ харилцагч үүсгэх"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Асаах"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Харилцагчдаа харахын тулд Харилцагчдын зөвшөөрлийг идэвхжүүлнэ үү."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Ямар ч харилцагчдын апликейшн байхгүй байна"</string>
diff --git a/java/com/android/dialer/widget/res/values-mr/strings.xml b/java/com/android/dialer/widget/res/values-mr/strings.xml
index 38d913a..63239d2 100644
--- a/java/com/android/dialer/widget/res/values-mr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-mr/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"एक सानुकूल संदेश लिहा"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"बंद करा"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"आपल्‍याकडे अद्याप कोणतेही संपर्क नाहीत"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"एक संपर्क जोडा"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"नवीन संपर्क तयार करा"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"चालू करा"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"आपले संपर्क पाहण्‍यासाठी, संपर्क परवानगी चालू करा."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"कोणताही संपर्क अॅप उपलब्ध नाही"</string>
diff --git a/java/com/android/dialer/widget/res/values-ms/strings.xml b/java/com/android/dialer/widget/res/values-ms/strings.xml
index bc67c67..cf61fc1 100644
--- a/java/com/android/dialer/widget/res/values-ms/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ms/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Tulis mesej tersuai"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Tutup"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Anda belum mempunyai sebarang kenalan"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Tambahkan kenalan"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Buat kenalan baharu"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Hidupkan"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Untuk melihat kenalan anda, hidupkan kebenaran Kenalan."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Tiada apl kenalan yang tersedia"</string>
diff --git a/java/com/android/dialer/widget/res/values-my/strings.xml b/java/com/android/dialer/widget/res/values-my/strings.xml
index c8e783b..5d3d9eb 100644
--- a/java/com/android/dialer/widget/res/values-my/strings.xml
+++ b/java/com/android/dialer/widget/res/values-my/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"စိတ်ကြိုက် မက်ဆေ့ဂျ်တစ်ခု ရေးပါ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ပိတ်ရန်"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"သင့်တွင် မည်သည့်အဆက်အသွယ်မျှ မရှိသေးပါ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"အဆက်အသွယ်တစ်ယောက် ထည့်မည်"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"အဆက်အသွယ်အသစ် ပြုလုပ်ရန်"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"ဖွင့်ရန်"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"အဆက်အသွယ်များကိုကြည့်ရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်ကို ဖွင့်ပါ။"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"အဆက်အသွယ်များ app မရှိပါ"</string>
diff --git a/java/com/android/dialer/widget/res/values-nb/strings.xml b/java/com/android/dialer/widget/res/values-nb/strings.xml
index 822f07e..4412182 100644
--- a/java/com/android/dialer/widget/res/values-nb/strings.xml
+++ b/java/com/android/dialer/widget/res/values-nb/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skriv egendefinert melding"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Lukk"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Du har ingen kontakter ennå"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Legg til en kontakt"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Slå på"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"For å se kontaktene dine må du slå på Kontakter-tillatelsen."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Ingen kontaktapper er tilgjengelige"</string>
diff --git a/java/com/android/dialer/widget/res/values-ne/strings.xml b/java/com/android/dialer/widget/res/values-ne/strings.xml
index ebb31d5..e1f6e95 100644
--- a/java/com/android/dialer/widget/res/values-ne/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ne/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"आफू अनुकूल सन्देश लेख्‍ने"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"बन्द गर्नुहोस्"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"अहिलेसम्म तपाईंसँग कुनै सम्पर्कहरू छैनन्"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"कुनै सम्पर्क थप्नुहोस्"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"नयाँ सम्पर्क सिर्जना गर्नुहोस्"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"सक्रिय गर्नुहोस्"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"आफ्ना सम्पर्कहरू हेर्न सम्पर्क सम्बन्धी अनुमतिलाई सक्रिय गर्नुहोस्।"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"सम्पर्क सम्बन्धी कुनै अनुप्रयोग उपलब्ध छैन"</string>
diff --git a/java/com/android/dialer/widget/res/values-nl/strings.xml b/java/com/android/dialer/widget/res/values-nl/strings.xml
index cbc286b..1fb5f5e 100644
--- a/java/com/android/dialer/widget/res/values-nl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-nl/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Schrijf zelf een bericht"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Sluiten"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Je hebt nog geen contacten"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Een contact toevoegen"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Inschakelen"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Als je je contacten wilt bekijken, schakel je de machtiging voor Contacten in."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Geen app voor contacten beschikbaar"</string>
diff --git a/java/com/android/dialer/widget/res/values-no/strings.xml b/java/com/android/dialer/widget/res/values-no/strings.xml
index 822f07e..4412182 100644
--- a/java/com/android/dialer/widget/res/values-no/strings.xml
+++ b/java/com/android/dialer/widget/res/values-no/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skriv egendefinert melding"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Lukk"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Du har ingen kontakter ennå"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Legg til en kontakt"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Slå på"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"For å se kontaktene dine må du slå på Kontakter-tillatelsen."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Ingen kontaktapper er tilgjengelige"</string>
diff --git a/java/com/android/dialer/widget/res/values-pa/strings.xml b/java/com/android/dialer/widget/res/values-pa/strings.xml
index 06f191e..14b7b41 100644
--- a/java/com/android/dialer/widget/res/values-pa/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pa/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਸੰਦੇਸ਼ ਲਿਖੋ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ਬੰਦ ਕਰੋ"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"ਤੁਹਾਡੇ ਕੋਲ ਹਾਲੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"ਕੋਈ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"ਚਾਲੂ ਕਰੋ"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਸੰਪਰਕ ਇਜਾਜ਼ਤ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"ਕੋਈ ਸੰਪਰਕ ਐਪ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
diff --git a/java/com/android/dialer/widget/res/values-pl/strings.xml b/java/com/android/dialer/widget/res/values-pl/strings.xml
index 5d62a07..3f0668c 100644
--- a/java/com/android/dialer/widget/res/values-pl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pl/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Wpisz wiadomość"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zamknij"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Nie masz jeszcze żadnych kontaktów"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Dodaj kontakt"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Utwórz nowy kontakt"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Włącz"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Aby zobaczyć swoje kontakty, włącz uprawnienia Kontakty."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nie jest dostępna żadna aplikacja do obsługi kontaktów"</string>
diff --git a/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml b/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml
index 0afc0f1..7bc501e 100644
--- a/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escreva sua mensagem"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Fechar"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Você ainda não tem contatos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Adicionar um contato"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Ativar"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver seus contatos, ative a permissão para o app Contatos."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nenhum app de contatos disponível"</string>
diff --git a/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml b/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml
index 35f71a3..459ba57 100644
--- a/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escreva uma mensagem"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Fechar"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Ainda não tem nenhum contacto"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Adicionar um contacto"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Ativar"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver os seus contactos, ative a autorização Contactos."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Não existe nenhuma aplicação de contactos disponível"</string>
diff --git a/java/com/android/dialer/widget/res/values-pt/strings.xml b/java/com/android/dialer/widget/res/values-pt/strings.xml
index 0afc0f1..7bc501e 100644
--- a/java/com/android/dialer/widget/res/values-pt/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pt/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escreva sua mensagem"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Fechar"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Você ainda não tem contatos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Adicionar um contato"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Ativar"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver seus contatos, ative a permissão para o app Contatos."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nenhum app de contatos disponível"</string>
diff --git a/java/com/android/dialer/widget/res/values-ro/strings.xml b/java/com/android/dialer/widget/res/values-ro/strings.xml
index 6c51d23..6138eb1 100644
--- a/java/com/android/dialer/widget/res/values-ro/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ro/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Scrieți mesaj personalizat"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Închideți"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Nu aveți încă persoane de contact."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Adăugați o persoană de contact"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Activați"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Pentru a vedea persoanele de contact, activați permisiunea pentru Agendă."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nu este disponibilă nicio aplicație pentru agendă"</string>
diff --git a/java/com/android/dialer/widget/res/values-ru/strings.xml b/java/com/android/dialer/widget/res/values-ru/strings.xml
index c36874d..7eb9f1d 100644
--- a/java/com/android/dialer/widget/res/values-ru/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ru/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Добавьте свой текст"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Закрыть"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Контактов нет"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Добавить контакт"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Предоставить разрешение"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Чтобы открыть список контактов, предоставьте приложению разрешение \"Контакты\"."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Нет приложения для работы с контактами"</string>
diff --git a/java/com/android/dialer/widget/res/values-si/strings.xml b/java/com/android/dialer/widget/res/values-si/strings.xml
index 10eb7b5..fb57425 100644
--- a/java/com/android/dialer/widget/res/values-si/strings.xml
+++ b/java/com/android/dialer/widget/res/values-si/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"අභිරුචි පණිවිඩයක් ලියන්න"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"වසන්න"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"ඔබට තවම කිසිදු සම්බන්ධතාවක් නැත"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"සම්බන්ධතාවක් එක් කරන්න"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"ක්‍රියාත්මක කරන්න"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"ඔබේ සම්බන්ධතා බැලීමට, සම්බන්ධතා අවසරය ක්‍රියාත්මක කරන්න."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"සබඳතා යෙදුම ලබා ගැනීමට නොහැකිය"</string>
diff --git a/java/com/android/dialer/widget/res/values-sk/strings.xml b/java/com/android/dialer/widget/res/values-sk/strings.xml
index 56f7ceb..5912b57 100644
--- a/java/com/android/dialer/widget/res/values-sk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sk/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napíšte vlastnú správu"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zavrieť"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Zatiaľ nemáte žiadne kontakty"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Pridať kontakt"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Zapnúť"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Ak si chcete zobraziť kontakty, zapnite povolenie Kontakty."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nie je k dispozícii žiadna aplikácia na prácu s kontaktmi"</string>
diff --git a/java/com/android/dialer/widget/res/values-sl/strings.xml b/java/com/android/dialer/widget/res/values-sl/strings.xml
index 52f0293..1ee87d1 100644
--- a/java/com/android/dialer/widget/res/values-sl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sl/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napišite sporočilo po meri"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zapri"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Nimate še nobenega stika"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Dodaj stik"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Vklopi"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Če si želite ogledati stike, vklopite dovoljenje za stike."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Na voljo ni nobene aplikacije za stike"</string>
diff --git a/java/com/android/dialer/widget/res/values-sq/strings.xml b/java/com/android/dialer/widget/res/values-sq/strings.xml
index c7943df..b55e47c 100644
--- a/java/com/android/dialer/widget/res/values-sq/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sq/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Shkruaj mesazh të person."</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Mbyll"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Nuk ke ende kontakte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Shto një kontakt"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktivizo"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Për të parë kontaktet, aktivizo lejen e Kontakteve."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Nuk ka asnjë aplikacion për kontaktet"</string>
diff --git a/java/com/android/dialer/widget/res/values-sr/strings.xml b/java/com/android/dialer/widget/res/values-sr/strings.xml
index 00b9b4f..c2f269d 100644
--- a/java/com/android/dialer/widget/res/values-sr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sr/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Напишите прилагођену поруку"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Затворите"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Још увек немате ниједан контакт"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Додај контакт"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Направи нови контакт"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Укључи"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Да бисте видели контакте, укључите дозволу за Контакте."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Нема доступне апликације за контакте"</string>
diff --git a/java/com/android/dialer/widget/res/values-sv/strings.xml b/java/com/android/dialer/widget/res/values-sv/strings.xml
index 3593970..75add78 100644
--- a/java/com/android/dialer/widget/res/values-sv/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sv/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skriv anpassat meddelande"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Stäng"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Du har inga kontakter ännu"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Lägg till en kontakt"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Skapa ny kontakt"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktivera"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Du måste aktivera behörigheten Kontakter för att visa kontakterna."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Det finns inga appar för kontakter"</string>
diff --git a/java/com/android/dialer/widget/res/values-sw/strings.xml b/java/com/android/dialer/widget/res/values-sw/strings.xml
index b089210..a913980 100644
--- a/java/com/android/dialer/widget/res/values-sw/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sw/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Andika ujumbe maalum"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Funga"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Bado huna anwani zozote"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Ongeza anwani"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Washa"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Ili uone anwani zako, washa ruhusa ya Anwani."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Hakuna programu ya anwani iliyopatikana"</string>
diff --git a/java/com/android/dialer/widget/res/values-ta/strings.xml b/java/com/android/dialer/widget/res/values-ta/strings.xml
index 83ca080..1733330 100644
--- a/java/com/android/dialer/widget/res/values-ta/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ta/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"தனிப்பயன் செய்தியை எழுதவும்"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"மூடு"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"இதுவரை தொடர்புகள் எதுவுமில்லை"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"தொடர்பைச் சேர்"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"புதிய தொடர்பை உருவாக்கு"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"இயக்கு"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"தொடர்புகளைப் பார்க்க, தொடர்புகள் அனுமதியை இயக்கவும்."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"தொடர்புகள் பயன்பாடு எதுவுமில்லை"</string>
diff --git a/java/com/android/dialer/widget/res/values-te/strings.xml b/java/com/android/dialer/widget/res/values-te/strings.xml
index 418cc3d..27e6b05 100644
--- a/java/com/android/dialer/widget/res/values-te/strings.xml
+++ b/java/com/android/dialer/widget/res/values-te/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"అనుకూల సందేశాన్ని వ్రాయండి"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"మూసివేయి"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"మీకు ఇప్పటికీ పరిచయాలేవీ లేవు"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"పరిచయాన్ని జోడించండి"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"కొత్త పరిచయాన్ని సృష్టించండి"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"ఆన్ చేయి"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"మీ పరిచయాలను చూడటానికి, పరిచయాల అనుమతిని ఆన్ చేయండి."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"పరిచయాల అనువర్తనం ఏదీ అందుబాటులో లేదు"</string>
diff --git a/java/com/android/dialer/widget/res/values-th/strings.xml b/java/com/android/dialer/widget/res/values-th/strings.xml
index c556d1c..40134c8 100644
--- a/java/com/android/dialer/widget/res/values-th/strings.xml
+++ b/java/com/android/dialer/widget/res/values-th/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"เขียนข้อความที่กำหนดเอง"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ปิด"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"คุณยังไม่มีรายชื่อติดต่อ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"เพิ่มรายชื่อติดต่อ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"สร้างรายชื่อติดต่อใหม่"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"เปิด"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"หากต้องการดูรายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"ไม่มีแอปรายชื่อติดต่อที่พร้อมใช้งาน"</string>
diff --git a/java/com/android/dialer/widget/res/values-tl/strings.xml b/java/com/android/dialer/widget/res/values-tl/strings.xml
index be02d19..406f18b 100644
--- a/java/com/android/dialer/widget/res/values-tl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-tl/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Sumulat ng custom na mensahe"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Isara"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Wala ka pang sinumang contact"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Magdagdag ng contact"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"I-on"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Upang makita ang iyong mga contact, i-on ang pahintulot ng Mga Contact."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Walang available na app ng mga contact"</string>
diff --git a/java/com/android/dialer/widget/res/values-tr/strings.xml b/java/com/android/dialer/widget/res/values-tr/strings.xml
index 90d5db6..e1dcabd 100644
--- a/java/com/android/dialer/widget/res/values-tr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-tr/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Özel bir mesaj yazın"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Kapat"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Henüz hiç kişiniz yok"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Kişi ekleyin"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Etkinleştir"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Kişilerinizi görmek için Kişiler iznini etkinleştirin."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Kullanılabilir kişi uygulaması yok"</string>
diff --git a/java/com/android/dialer/widget/res/values-uk/strings.xml b/java/com/android/dialer/widget/res/values-uk/strings.xml
index cf5a7d1..d1a281c 100644
--- a/java/com/android/dialer/widget/res/values-uk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-uk/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Ваше власне повідомлення"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Закрити"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Ще немає контактів"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Додати контакт"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Створити контакт"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Увімкнути"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Щоб переглянути контакти, увімкніть дозвіл \"Контакти\"."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Немає додатка з контактами"</string>
diff --git a/java/com/android/dialer/widget/res/values-ur/strings.xml b/java/com/android/dialer/widget/res/values-ur/strings.xml
index e5199af..d5dcad0 100644
--- a/java/com/android/dialer/widget/res/values-ur/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ur/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ایک حسب ضرورت پیغام لکھیں"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"بند کریں"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"آپ کے پاس ابھی تک کوئی رابطے نہیں ہیں"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"ایک رابطہ شامل کریں"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"نیا رابطہ بنائیں"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"آن کریں"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"اپنے رابطے دیکھنے کیلئے رابطوں کی اجازت آن کریں۔"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"رابطوں کی کوئی ایپ دستیاب نہیں ہے"</string>
diff --git a/java/com/android/dialer/widget/res/values-uz/strings.xml b/java/com/android/dialer/widget/res/values-uz/strings.xml
index eb0e0ad..b3003be 100644
--- a/java/com/android/dialer/widget/res/values-uz/strings.xml
+++ b/java/com/android/dialer/widget/res/values-uz/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Boshqa xabar yozing"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Yopish"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Kontaktlar yo‘q"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Kontakt qo‘shish"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Ruxsat berish"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktlar ro‘yxatini ko‘rish uchun ilovaga Kontaktlarga kirishga ruxsat bering."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Kontaktlarni ochadigan ilova yo‘q"</string>
diff --git a/java/com/android/dialer/widget/res/values-vi/strings.xml b/java/com/android/dialer/widget/res/values-vi/strings.xml
index 62e94b8..68669ec 100644
--- a/java/com/android/dialer/widget/res/values-vi/strings.xml
+++ b/java/com/android/dialer/widget/res/values-vi/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Viết tin nhắn tùy chỉnh"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Đóng"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Bạn chưa có bất kỳ liên hệ nào"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Thêm liên hệ"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Bật"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Để xem danh bạ của bạn, bật quyền đối với Danh bạ."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Không có ứng dụng danh bạ"</string>
diff --git a/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml b/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml
index 063301a..4a5e458 100644
--- a/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"自行撰写信息"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"关闭"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"您还没有任何联系人"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"添加联系人"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"创建新联系人"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"开启"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"要查看您的联系人，请开启“通讯录”权限。"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"没有可用的通讯录应用"</string>
diff --git a/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml b/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml
index e2e69b7..3d5fe6e 100644
--- a/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"撰寫自訂訊息"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"關閉"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"您尚無任何聯絡人"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"新增聯絡人"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"建立新聯絡人"</string>
     <string name="permission_single_turn_on" msgid="1306416016676232584">"開放"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"如要查看聯絡人，請開放「通訊錄」權限。"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"沒有可用的聯絡人應用程式"</string>
diff --git a/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml b/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml
index 85768af..0cb8d15 100644
--- a/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"撰寫自訂訊息"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"關閉"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"你還沒有任何聯絡人"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"新增聯絡人"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"開啟"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"如要查看你的聯絡人，請開啟「聯絡人」存取權限。"</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"沒有可用的聯絡人應用程式"</string>
diff --git a/java/com/android/dialer/widget/res/values-zu/strings.xml b/java/com/android/dialer/widget/res/values-zu/strings.xml
index a3ba84a..ca58983 100644
--- a/java/com/android/dialer/widget/res/values-zu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zu/strings.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Bhala umlayezo wangokwezifiso"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Vala"</string>
     <string name="all_contacts_empty" msgid="4260556610403994011">"Awunabo oxhumana nabo okwamanje"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="69234925354938480">"Engeza oxhumana naye"</string>
+    <!-- no translation found for all_contacts_empty_add_contact_action (7850060327481179533) -->
+    <skip />
     <string name="permission_single_turn_on" msgid="1306416016676232584">"Vula"</string>
     <string name="permission_no_contacts" msgid="2388204904477299207">"Ukuze ubone oxhumana nabo, vula imvume yoxhumana nabo."</string>
     <string name="add_contact_not_available" msgid="3083256438899321502">"Alukho uhlelo lokusebenza loxhumana nabo olutholakalayo"</string>
diff --git a/java/com/android/dialer/widget/res/values/strings.xml b/java/com/android/dialer/widget/res/values/strings.xml
index d6ea2e7..74a5f0f 100644
--- a/java/com/android/dialer/widget/res/values/strings.xml
+++ b/java/com/android/dialer/widget/res/values/strings.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 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>
   <!-- Hint in a text field to compose a custom message to send with a phone call [CHAR LIMIT=27] -->
   <string name="custom_message_hint">Write a custom message</string>
@@ -10,7 +25,7 @@
   <string name="all_contacts_empty">You don\'t have any contacts yet</string>
 
   <!-- [CHAR LIMIT=NONE] Shown as an action when the all contacts list is empty -->
-  <string name="all_contacts_empty_add_contact_action">Add a contact</string>
+  <string name="all_contacts_empty_add_contact_action">Create new contact</string>
 
   <!-- The label of the button used to turn on a single permission [CHAR LIMIT=30]-->
   <string name="permission_single_turn_on">Turn on</string>
diff --git a/java/com/android/dialershared/bubble/Bubble.java b/java/com/android/dialershared/bubble/Bubble.java
index 3eb88aa..dbb5ea7 100644
--- a/java/com/android/dialershared/bubble/Bubble.java
+++ b/java/com/android/dialershared/bubble/Bubble.java
@@ -26,8 +26,12 @@
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.PixelFormat;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RippleDrawable;
 import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Handler;
 import android.provider.Settings;
 import android.support.annotation.ColorInt;
@@ -47,6 +51,7 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewGroup.MarginLayoutParams;
 import android.view.ViewPropertyAnimator;
 import android.view.ViewTreeObserver.OnPreDrawListener;
 import android.view.WindowManager;
@@ -69,6 +74,8 @@
  * convenience)
  */
 public class Bubble {
+  // This class has some odd behavior that is not immediately obvious in order to avoid jank when
+  // resizing. See http://go/bubble-resize for details.
 
   // How long text should show after showText(CharSequence) is called
   private static final int SHOW_TEXT_DURATION_MILLIS = 3000;
@@ -96,6 +103,8 @@
   private final Handler handler = new Handler();
 
   private ViewHolder viewHolder;
+  private ViewPropertyAnimator collapseAnimation;
+  private Integer overrideGravity;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({CollapseEnd.NOTHING, CollapseEnd.HIDE})
@@ -114,7 +123,7 @@
   public static boolean canShowBubbles(@NonNull Context context) {
     return canShowBubblesForTesting != null
         ? canShowBubblesForTesting
-        : Settings.canDrawOverlays(context);
+        : VERSION.SDK_INT < VERSION_CODES.M || Settings.canDrawOverlays(context);
   }
 
   @VisibleForTesting(otherwise = VisibleForTesting.NONE)
@@ -127,7 +136,7 @@
   public static Intent getRequestPermissionIntent(@NonNull Context context) {
     return new Intent(
         Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-        new Uri.Builder().scheme("package").fragment(context.getPackageName()).build());
+        Uri.fromParts("package", context.getPackageName(), null));
   }
 
   /** Creates instances of Bubble. The default implementation just calls the constructor. */
@@ -183,13 +192,12 @@
               type,
               LayoutParams.FLAG_NOT_TOUCH_MODAL
                   | LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
-                  | LayoutParams.FLAG_NOT_FOCUSABLE,
+                  | LayoutParams.FLAG_NOT_FOCUSABLE
+                  | LayoutParams.FLAG_LAYOUT_NO_LIMITS,
               PixelFormat.TRANSLUCENT);
       windowParams.gravity = Gravity.TOP | Gravity.LEFT;
-      windowParams.x =
-          context.getResources().getDimensionPixelOffset(R.dimen.bubble_initial_offset_x);
-      windowParams.y =
-          context.getResources().getDimensionPixelOffset(R.dimen.bubble_initial_offset_y);
+      windowParams.x = context.getResources().getDimensionPixelOffset(R.dimen.bubble_safe_margin_x);
+      windowParams.y = currentInfo.getStartingYPosition();
       windowParams.height = LayoutParams.WRAP_CONTENT;
       windowParams.width = LayoutParams.WRAP_CONTENT;
     }
@@ -203,6 +211,7 @@
     showAnimator.setInterpolator(new OvershootInterpolator());
     showAnimator.start();
     isShowing = true;
+    updatePrimaryIconAnimation();
   }
 
   /**
@@ -235,6 +244,7 @@
             () -> {
               windowManager.removeView(viewHolder.getRoot());
               isShowing = false;
+              updatePrimaryIconAnimation();
             })
         .start();
   }
@@ -342,6 +352,11 @@
         SHOW_TEXT_DURATION_MILLIS);
   }
 
+  @Nullable
+  Integer getGravityOverride() {
+    return overrideGravity;
+  }
+
   void onMoveStart() {
     startCollapse(CollapseEnd.NOTHING);
     viewHolder
@@ -353,23 +368,27 @@
 
   void onMoveFinish() {
     viewHolder.getPrimaryButton().animate().translationZ(0);
+    // If it's GONE, no resize is necessary. If it's VISIBLE, it will get cleaned up when the
+    // collapse animation finishes
+    if (viewHolder.getExpandedView().getVisibility() == View.INVISIBLE) {
+      doResize(null);
+    }
   }
 
   void primaryButtonClick() {
     if (expanded || textShowing || currentInfo.getActions().isEmpty()) {
       try {
-        currentInfo.getPrimaryAction().send();
+        currentInfo.getPrimaryIntent().send();
       } catch (CanceledException e) {
         throw new RuntimeException(e);
       }
       return;
     }
 
-    boolean onRight = (windowParams.gravity & Gravity.RIGHT) == Gravity.RIGHT;
     doResize(
         () -> {
-          onLeftRightSwitch(onRight);
-          viewHolder.getExpandedView().setVisibility(View.VISIBLE);
+          onLeftRightSwitch(isDrawingFromRight());
+          viewHolder.setDrawerVisibility(View.VISIBLE);
         });
     View expandedView = viewHolder.getExpandedView();
     expandedView
@@ -380,7 +399,7 @@
               public boolean onPreDraw() {
                 expandedView.getViewTreeObserver().removeOnPreDrawListener(this);
                 expandedView.setTranslationX(
-                    onRight ? expandedView.getWidth() : -expandedView.getWidth());
+                    isDrawingFromRight() ? expandedView.getWidth() : -expandedView.getWidth());
                 expandedView
                     .animate()
                     .setInterpolator(new LinearOutSlowInInterpolator())
@@ -393,6 +412,14 @@
   }
 
   void onLeftRightSwitch(boolean onRight) {
+    if (viewHolder.isMoving()) {
+      if (viewHolder.getExpandedView().getVisibility() == View.GONE) {
+        // If the drawer is not part of the layout we don't need to do anything. Layout flips will
+        // happen if necessary when opening the drawer.
+        return;
+      }
+    }
+
     viewHolder
         .getRoot()
         .setLayoutDirection(onRight ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR);
@@ -437,6 +464,7 @@
     viewHolder.getSecondButton().setVisibility(numButtons < 2 ? View.GONE : View.VISIBLE);
 
     viewHolder.getPrimaryIcon().setImageIcon(currentInfo.getPrimaryIcon());
+    updatePrimaryIconAnimation();
 
     viewHolder
         .getExpandedView()
@@ -445,6 +473,17 @@
     updateButtonStates();
   }
 
+  private void updatePrimaryIconAnimation() {
+    Drawable drawable = viewHolder.getPrimaryIcon().getDrawable();
+    if (drawable instanceof Animatable) {
+      if (isShowing) {
+        ((Animatable) drawable).start();
+      } else {
+        ((Animatable) drawable).stop();
+      }
+    }
+  }
+
   private void setBackgroundDrawable(CheckableImageButton view, @ColorInt int color) {
     RippleDrawable itemRipple =
         (RippleDrawable)
@@ -492,7 +531,7 @@
 
   private void doAction(Action action) {
     try {
-      action.getAction().send();
+      action.getIntent().send();
     } catch (CanceledException e) {
       throw new RuntimeException(e);
     }
@@ -504,9 +543,8 @@
     // would occur. To fix this, instead of resizing the window, we create a new one and destroy
     // the old one. There is a short delay before destroying the old view to ensure the new one has
     // had time to draw.
-    boolean onRight = (windowParams.gravity & Gravity.RIGHT) == Gravity.RIGHT;
     ViewHolder oldViewHolder = viewHolder;
-    if (onRight) {
+    if (isDrawingFromRight()) {
       viewHolder = new ViewHolder(oldViewHolder.getRoot().getContext());
       update();
       viewHolder
@@ -519,12 +557,13 @@
       operation.run();
     }
 
-    if (onRight) {
+    if (isDrawingFromRight()) {
       swapViewHolders(oldViewHolder);
     }
   }
 
   private void swapViewHolders(ViewHolder oldViewHolder) {
+    oldViewHolder.getShadowProvider().setVisibility(View.GONE);
     ViewGroup root = viewHolder.getRoot();
     windowManager.addView(root, windowParams);
     root.getViewTreeObserver()
@@ -542,32 +581,56 @@
             });
   }
 
-  private ViewPropertyAnimator startCollapse(@CollapseEnd int collapseEndAction) {
-    setFocused(false);
-    boolean onRight = (windowParams.gravity & Gravity.RIGHT) == Gravity.RIGHT;
+  private void startCollapse(@CollapseEnd int collapseEndAction) {
     View expandedView = viewHolder.getExpandedView();
-    return expandedView
-        .animate()
-        .translationX(onRight ? expandedView.getWidth() : -expandedView.getWidth())
-        .setInterpolator(new FastOutLinearInInterpolator())
-        .withEndAction(
-            () -> {
-              expanded = false;
-              if (collapseEndAction == CollapseEnd.HIDE) {
-                hide();
-              } else if (!textShowing) {
-                // Don't swap the window while the user is moving it, even if we're on the right.
-                // The movement will help hide the jank of the resize.
-                boolean swapWindow = onRight && !viewHolder.isMoving();
-                if (swapWindow) {
-                  // We don't actually need to set the drawer to GONE since in the new window it
-                  // will already be GONE. Just do the resize operation.
-                  doResize(null);
-                } else {
-                  expandedView.setVisibility(View.GONE);
-                }
-              }
-            });
+    if (expandedView.getVisibility() != View.VISIBLE || collapseAnimation != null) {
+      // Drawer is already collapsed or animation is running.
+      return;
+    }
+
+    overrideGravity = isDrawingFromRight() ? Gravity.RIGHT : Gravity.LEFT;
+    setFocused(false);
+    collapseAnimation =
+        expandedView
+            .animate()
+            .translationX(isDrawingFromRight() ? expandedView.getWidth() : -expandedView.getWidth())
+            .setInterpolator(new FastOutLinearInInterpolator())
+            .withEndAction(
+                () -> {
+                  collapseAnimation = null;
+                  expanded = false;
+
+                  if (textShowing) {
+                    // Will do resize once the text is done.
+                    return;
+                  }
+
+                  // Hide the drawer and resize if possible.
+                  viewHolder.setDrawerVisibility(View.INVISIBLE);
+                  if (!viewHolder.isMoving() || !isDrawingFromRight()) {
+                    doResize(() -> viewHolder.setDrawerVisibility(View.GONE));
+                  }
+
+                  // If this collapse was to come before a hide, do it now.
+                  if (collapseEndAction == CollapseEnd.HIDE) {
+                    hide();
+                  }
+
+                  // Resume normal gravity after any resizing is done.
+                  handler.postDelayed(
+                      () -> {
+                        overrideGravity = null;
+                        if (!viewHolder.isMoving()) {
+                          viewHolder.undoGravityOverride();
+                        }
+                      },
+                      // Need to wait twice as long for resize and layout
+                      WINDOW_REDRAW_DELAY_MILLIS * 2);
+                });
+  }
+
+  private boolean isDrawingFromRight() {
+    return (windowParams.gravity & Gravity.RIGHT) == Gravity.RIGHT;
   }
 
   private void setFocused(boolean focused) {
@@ -594,6 +657,7 @@
     private final CheckableImageButton secondButton;
     private final CheckableImageButton thirdButton;
     private final View expandedView;
+    private final View shadowProvider;
 
     public ViewHolder(Context context) {
       // Window root is not in the layout file so that the inflater has a view to inflate into
@@ -604,6 +668,7 @@
       primaryButton = contentView.findViewById(R.id.bubble_button_primary);
       primaryIcon = contentView.findViewById(R.id.bubble_icon_primary);
       primaryText = contentView.findViewById(R.id.bubble_text);
+      shadowProvider = contentView.findViewById(R.id.bubble_drawer_shadow_provider);
 
       firstButton = contentView.findViewById(R.id.bubble_icon_first);
       secondButton = contentView.findViewById(R.id.bubble_icon_second);
@@ -625,6 +690,28 @@
             }
             return false;
           });
+      expandedView
+          .getViewTreeObserver()
+          .addOnDrawListener(
+              () -> {
+                int translationX = (int) expandedView.getTranslationX();
+                int parentOffset =
+                    ((MarginLayoutParams) ((ViewGroup) expandedView.getParent()).getLayoutParams())
+                        .leftMargin;
+                if (isDrawingFromRight()) {
+                  int maxLeft =
+                      shadowProvider.getRight()
+                          - context.getResources().getDimensionPixelSize(R.dimen.bubble_size);
+                  shadowProvider.setLeft(
+                      Math.min(maxLeft, expandedView.getLeft() + translationX + parentOffset));
+                } else {
+                  int minRight =
+                      shadowProvider.getLeft()
+                          + context.getResources().getDimensionPixelSize(R.dimen.bubble_size);
+                  shadowProvider.setRight(
+                      Math.max(minRight, expandedView.getRight() + translationX + parentOffset));
+                }
+              });
       moveHandler = new MoveHandler(primaryButton, Bubble.this);
     }
 
@@ -660,8 +747,21 @@
       return expandedView;
     }
 
+    public View getShadowProvider() {
+      return shadowProvider;
+    }
+
+    public void setDrawerVisibility(int visibility) {
+      expandedView.setVisibility(visibility);
+      shadowProvider.setVisibility(visibility);
+    }
+
     public boolean isMoving() {
       return moveHandler.isMoving();
     }
+
+    public void undoGravityOverride() {
+      moveHandler.undoGravityOverride();
+    }
   }
 }
diff --git a/java/com/android/dialershared/bubble/BubbleInfo.java b/java/com/android/dialershared/bubble/BubbleInfo.java
index 52417ae..eb9abd0 100644
--- a/java/com/android/dialershared/bubble/BubbleInfo.java
+++ b/java/com/android/dialershared/bubble/BubbleInfo.java
@@ -20,6 +20,7 @@
 import android.graphics.drawable.Icon;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
+import android.support.annotation.Px;
 import com.google.auto.value.AutoValue;
 import java.util.Collections;
 import java.util.List;
@@ -34,7 +35,10 @@
   public abstract Icon getPrimaryIcon();
 
   @NonNull
-  public abstract PendingIntent getPrimaryAction();
+  public abstract PendingIntent getPrimaryIntent();
+
+  @Px
+  public abstract int getStartingYPosition();
 
   @NonNull
   public abstract List<Action> getActions();
@@ -45,9 +49,10 @@
 
   public static Builder from(@NonNull BubbleInfo bubbleInfo) {
     return builder()
-        .setPrimaryAction(bubbleInfo.getPrimaryAction())
+        .setPrimaryIntent(bubbleInfo.getPrimaryIntent())
         .setPrimaryColor(bubbleInfo.getPrimaryColor())
         .setPrimaryIcon(bubbleInfo.getPrimaryIcon())
+        .setStartingYPosition(bubbleInfo.getStartingYPosition())
         .setActions(bubbleInfo.getActions());
   }
 
@@ -59,7 +64,9 @@
 
     public abstract Builder setPrimaryIcon(@NonNull Icon primaryIcon);
 
-    public abstract Builder setPrimaryAction(@NonNull PendingIntent primaryAction);
+    public abstract Builder setPrimaryIntent(@NonNull PendingIntent primaryIntent);
+
+    public abstract Builder setStartingYPosition(@Px int startingYPosition);
 
     public abstract Builder setActions(List<Action> actions);
 
@@ -77,7 +84,7 @@
     public abstract CharSequence getName();
 
     @NonNull
-    public abstract PendingIntent getAction();
+    public abstract PendingIntent getIntent();
 
     public abstract boolean isEnabled();
 
@@ -89,7 +96,7 @@
 
     public static Builder from(@NonNull Action action) {
       return builder()
-          .setAction(action.getAction())
+          .setIntent(action.getIntent())
           .setChecked(action.isChecked())
           .setEnabled(action.isEnabled())
           .setName(action.getName())
@@ -104,7 +111,7 @@
 
       public abstract Builder setName(@NonNull CharSequence name);
 
-      public abstract Builder setAction(@NonNull PendingIntent action);
+      public abstract Builder setIntent(@NonNull PendingIntent intent);
 
       public abstract Builder setEnabled(boolean enabled);
 
diff --git a/java/com/android/dialershared/bubble/MoveHandler.java b/java/com/android/dialershared/bubble/MoveHandler.java
index 8a21cd7..bc6db64 100644
--- a/java/com/android/dialershared/bubble/MoveHandler.java
+++ b/java/com/android/dialershared/bubble/MoveHandler.java
@@ -39,7 +39,7 @@
   // Amount the ViewConfiguration's minFlingVelocity will be scaled by for our own minVelocity
   private static final int MIN_FLING_VELOCITY_FACTOR = 8;
   // The friction multiplier to control how slippery the bubble is when flung
-  private static final float SCROLL_FRICTION_MULTIPLIER = 8f;
+  private static final float SCROLL_FRICTION_MULTIPLIER = 4f;
 
   private final Context context;
   private final WindowManager windowManager;
@@ -78,12 +78,22 @@
 
         @Override
         public void setValue(LayoutParams windowParams, float value) {
+          boolean wasOnRight = (windowParams.gravity & Gravity.RIGHT) == Gravity.RIGHT;
           int displayWidth = context.getResources().getDisplayMetrics().widthPixels;
-          boolean onRight = value > displayWidth / 2;
+          boolean onRight;
+          Integer gravityOverride = bubble.getGravityOverride();
+          if (gravityOverride == null) {
+            onRight = value > displayWidth / 2;
+          } else {
+            onRight = (gravityOverride & Gravity.RIGHT) == Gravity.RIGHT;
+          }
           int centeringOffset = bubbleSize / 2 + shadowPaddingSize;
           windowParams.x =
               (int) (onRight ? (displayWidth - value - centeringOffset) : value - centeringOffset);
           windowParams.gravity = Gravity.TOP | (onRight ? Gravity.RIGHT : Gravity.LEFT);
+          if (wasOnRight != onRight) {
+            bubble.onLeftRightSwitch(onRight);
+          }
           if (bubble.isShowing()) {
             windowManager.updateViewLayout(bubble.getRootView(), windowParams);
           }
@@ -134,6 +144,11 @@
     return isMoving;
   }
 
+  public void undoGravityOverride() {
+    LayoutParams windowParams = bubble.getWindowParams();
+    xProperty.setValue(windowParams, xProperty.getValue(windowParams));
+  }
+
   @Override
   public boolean onTouch(View v, MotionEvent event) {
     float eventX = event.getRawX();
@@ -190,13 +205,12 @@
           } else {
             snapX();
           }
-
+          isMoving = false;
           bubble.onMoveFinish();
         } else {
           v.performClick();
           bubble.primaryButtonClick();
         }
-        isMoving = false;
         break;
     }
     return true;
diff --git a/java/com/android/dialershared/bubble/g3doc/INTEGRATION.md b/java/com/android/dialershared/bubble/g3doc/INTEGRATION.md
new file mode 100644
index 0000000..a13a605
--- /dev/null
+++ b/java/com/android/dialershared/bubble/g3doc/INTEGRATION.md
@@ -0,0 +1,69 @@
+# Floating Bubble Integration
+
+go/bubble-integration
+
+Author: keyboardr@
+
+Last Updated: 2017-06-06
+
+Floating bubbles provide a lightweight means of providing interactive UI while
+the user is away from the app. This document details the steps necessary to
+integrate these bubbles into your app.
+
+[TOC]
+
+![Floating bubble](images/bubble_collapsed.png){height=400}
+
+## Ensure Bubbles can be shown
+
+Add the `android.permission.SYSTEM_ALERT_WINDOW` permission to your manifest.
+Before you show the bubble, call `Bubble.canShowBubbles(Context)` to see if the
+user has granted you permission. If not, you can start an Activity from
+`Bubble.getRequestPermissionIntent(Context)` to navigate the user to the system
+settings to enable drawing over other apps. This is more than just a simple
+runtime permission; the user must explicitly allow you to draw over other apps
+via this system setting. System apps may have this allowed by default, but be
+sure to test.
+
+## Create your initial `BubbleInfo`
+
+Use `BubbleInfo.builder()` to populate a `BubbleInfo` with your color, main
+icon, main Intent (which should navigate back to your app), starting Y position,
+and a list of `Actions` to put in the drawer. Each `Action` will define its
+icon, user-displayable name (used for content description), Intent to perform
+when clicked, whether it is enabled (optional, default true), and whether it is
+checked (optional, default false).
+
+![Floating bubble expanded](images/bubble_expanded.png){height=400}
+
+## Create, show, and hide the Bubble
+
+Create the bubble using `Bubble.createBubble(Context, BubbleInfo)`. The `show()`
+method is safe to call at any time. If the Bubble is already showing, it is a
+no-op. `hide()` may also be called at any time and will collapse the drawer
+before hiding if already open. While `show()` will show immediately, `hide()`
+may need to wait for other operations or animations before the bubble is hidden.
+It is unlikely you will need to keep track of this, however. The bubble will be
+hidden at its next opportunity, and `hide()` will not block.
+
+![Floating bubble with state](images/bubble_state.png){height=400}
+
+## Update the Bubble's state
+
+Call `Bubble.setBubbleInfo(BubbleInfo)` to update all displayed state.
+`BubbleInfo`s are immutable, so to make a new one using an existing
+`BubbleInfo`, use `BubbleInfo.from(BubbleInfo)` to get a `Builder` with
+prepopulated info. If only the `Action` state has changed, it is more efficient
+to just call `Bubble.updateActions(List<Action>)`
+
+![Floating bubble with text](images/bubble_text.png){height=400}
+
+## Show text
+
+To temporarily replace the icon with a textual message, call
+`Bubble.showText(CharSequence)`. The text will be displayed for several seconds
+before transitioning back to the primary icon. The drawer will be closed if open
+and cannot be reopened while the text is displayed. Any calls to `hide()` will
+be deferred until after the text is done being displayed, so if you wish to show
+an ending message of some sort you may call `hide()` immediately after
+`showText(CharSequence)`.
diff --git a/java/com/android/dialershared/bubble/g3doc/images/bubble_collapsed.png b/java/com/android/dialershared/bubble/g3doc/images/bubble_collapsed.png
new file mode 100644
index 0000000..7ecc067
--- /dev/null
+++ b/java/com/android/dialershared/bubble/g3doc/images/bubble_collapsed.png
Binary files differ
diff --git a/java/com/android/dialershared/bubble/g3doc/images/bubble_expanded.png b/java/com/android/dialershared/bubble/g3doc/images/bubble_expanded.png
new file mode 100644
index 0000000..cd477f3
--- /dev/null
+++ b/java/com/android/dialershared/bubble/g3doc/images/bubble_expanded.png
Binary files differ
diff --git a/java/com/android/dialershared/bubble/g3doc/images/bubble_state.png b/java/com/android/dialershared/bubble/g3doc/images/bubble_state.png
new file mode 100644
index 0000000..21ca8a8
--- /dev/null
+++ b/java/com/android/dialershared/bubble/g3doc/images/bubble_state.png
Binary files differ
diff --git a/java/com/android/dialershared/bubble/g3doc/images/bubble_text.png b/java/com/android/dialershared/bubble/g3doc/images/bubble_text.png
new file mode 100644
index 0000000..9c476dc
--- /dev/null
+++ b/java/com/android/dialershared/bubble/g3doc/images/bubble_text.png
Binary files differ
diff --git a/java/com/android/dialershared/bubble/res/layout/bubble_base.xml b/java/com/android/dialershared/bubble/res/layout/bubble_base.xml
index 3acd2af..76970f0 100644
--- a/java/com/android/dialershared/bubble/res/layout/bubble_base.xml
+++ b/java/com/android/dialershared/bubble/res/layout/bubble_base.xml
@@ -19,24 +19,36 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:clipToPadding="false"
     tools:theme="@style/Theme.AppCompat">
+  <View
+      android:id="@+id/bubble_drawer_shadow_provider"
+      android:layout_width="@dimen/bubble_size"
+      android:layout_height="@dimen/bubble_size"
+      android:layout_marginTop="@dimen/bubble_shadow_padding_size"
+      android:layout_marginBottom="@dimen/bubble_shadow_padding_size"
+      android:layout_marginStart="@dimen/bubble_shadow_padding_size"
+      android:background="@drawable/bubble_ripple_circle"
+      android:backgroundTint="@android:color/transparent"
+      android:elevation="10dp"
+      android:visibility="invisible"
+      />
   <FrameLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="48dp"
+      android:elevation="10dp"
       android:paddingTop="@dimen/bubble_shadow_padding_size"
       android:paddingBottom="@dimen/bubble_shadow_padding_size"
-      android:paddingEnd="@dimen/bubble_shadow_padding_size"
-      android:background="@android:color/transparent">
+      android:paddingEnd="@dimen/bubble_shadow_padding_size">
 
     <LinearLayout
         android:id="@+id/bubble_expanded_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="32dp"
-        android:paddingEnd="12dp"
+        android:paddingEnd="8dp"
         android:background="@drawable/bubble_background_pill_ltr"
-        android:elevation="2dp"
         android:layoutDirection="inherit"
         android:orientation="horizontal"
         android:visibility="gone"
@@ -80,16 +92,15 @@
       android:layout_height="wrap_content"
       android:layout_gravity="start"
       android:animateLayoutChanges="true"
-      android:background="@android:color/transparent"
       android:clipChildren="false"
-      android:clipToPadding="false">
+      android:clipToPadding="false"
+      android:elevation="12dp">
     <ViewAnimator
         android:id="@+id/bubble_button_primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/bubble_shadow_padding_size"
         android:background="@drawable/bubble_ripple_circle"
-        android:elevation="6dp"
         android:measureAllChildren="false"
         tools:backgroundTint="#FF0000AA">
       <ImageView
diff --git a/java/com/android/dialershared/bubble/res/values/values.xml b/java/com/android/dialershared/bubble/res/values/values.xml
index 5b85e0d..f581617 100644
--- a/java/com/android/dialershared/bubble/res/values/values.xml
+++ b/java/com/android/dialershared/bubble/res/values/values.xml
@@ -16,12 +16,10 @@
   -->
 
 <resources>
-  <dimen name="bubble_safe_margin_x">0dp</dimen>
-  <dimen name="bubble_safe_margin_y">0dp</dimen>
-  <dimen name="bubble_initial_offset_x">0dp</dimen>
-  <dimen name="bubble_initial_offset_y">120dp</dimen>
-  <dimen name="bubble_size">64dp</dimen>
-  <dimen name="bubble_icon_padding">20dp</dimen>
+  <dimen name="bubble_safe_margin_x">16dp</dimen>
+  <dimen name="bubble_safe_margin_y">64dp</dimen>
+  <dimen name="bubble_size">56dp</dimen>
+  <dimen name="bubble_icon_padding">16dp</dimen>
   <dimen name="bubble_move_elevation_change">4dp</dimen>
   <dimen name="bubble_shadow_padding_size">16dp</dimen>
 </resources>
diff --git a/java/com/android/incallui/AnswerScreenPresenter.java b/java/com/android/incallui/AnswerScreenPresenter.java
index ddbe6cc..d530401 100644
--- a/java/com/android/incallui/AnswerScreenPresenter.java
+++ b/java/com/android/incallui/AnswerScreenPresenter.java
@@ -17,12 +17,14 @@
 package com.android.incallui;
 
 import android.content.Context;
+import android.os.SystemClock;
 import android.support.annotation.FloatRange;
 import android.support.annotation.NonNull;
 import android.support.v4.os.UserManagerCompat;
 import android.telecom.VideoProfile;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.ThreadUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.incallui.answer.protocol.AnswerScreen;
@@ -36,11 +38,14 @@
 /** Manages changes for an incoming call screen. */
 public class AnswerScreenPresenter
     implements AnswerScreenDelegate, DialerCall.CannedTextResponsesLoadedListener {
+  private static final int ACCEPT_REJECT_CALL_TIME_OUT_IN_MILLIS = 5000;
+
   @NonNull private final Context context;
   @NonNull private final AnswerScreen answerScreen;
   @NonNull private final DialerCall call;
+  private long actionPerformedTimeMillis;
 
-  public AnswerScreenPresenter(
+  AnswerScreenPresenter(
       @NonNull Context context, @NonNull AnswerScreen answerScreen, @NonNull DialerCall call) {
     LogUtil.i("AnswerScreenPresenter.constructor", null);
     this.context = Assert.isNotNull(context);
@@ -60,6 +65,13 @@
   }
 
   @Override
+  public boolean isActionTimeout() {
+    return actionPerformedTimeMillis != 0
+        && SystemClock.elapsedRealtime() - actionPerformedTimeMillis
+            >= ACCEPT_REJECT_CALL_TIME_OUT_IN_MILLIS;
+  }
+
+  @Override
   public void onAnswerScreenUnready() {
     call.removeCannedTextResponsesLoadedListener(this);
   }
@@ -73,6 +85,7 @@
   public void onRejectCallWithMessage(String message) {
     call.reject(true /* rejectWithMessage */, message);
     onDismissDialog();
+    addTimeoutCheck();
   }
 
   @Override
@@ -100,6 +113,7 @@
         call.answer();
       }
     }
+    addTimeoutCheck();
   }
 
   @Override
@@ -114,6 +128,7 @@
     } else {
       call.reject(false /* rejectWithMessage */, null);
     }
+    addTimeoutCheck();
   }
 
   @Override
@@ -128,6 +143,7 @@
       activeCall.addListener(new AnswerOnDisconnected(activeCall));
       activeCall.disconnect();
     }
+    addTimeoutCheck();
   }
 
   @Override
@@ -165,7 +181,7 @@
 
     private final DialerCall disconnectingCall;
 
-    public AnswerOnDisconnected(DialerCall disconnectingCall) {
+    AnswerOnDisconnected(DialerCall disconnectingCall) {
       this.disconnectingCall = disconnectingCall;
     }
 
@@ -209,4 +225,23 @@
     return UserManagerCompat.isUserUnlocked(context)
         && call.can(android.telecom.Call.Details.CAPABILITY_RESPOND_VIA_TEXT);
   }
+
+  private void addTimeoutCheck() {
+    actionPerformedTimeMillis = SystemClock.elapsedRealtime();
+    if (answerScreen.getAnswerScreenFragment().isVisible()) {
+      ThreadUtil.postDelayedOnUiThread(
+          () -> {
+            if (!answerScreen.getAnswerScreenFragment().isVisible()) {
+              LogUtil.d(
+                  "AnswerScreenPresenter.addTimeoutCheck",
+                  "accept/reject call timed out, do nothing");
+              return;
+            }
+            LogUtil.i("AnswerScreenPresenter.addTimeoutCheck", "accept/reject call timed out");
+            // Force re-evaluate which fragment to show.
+            InCallPresenter.getInstance().refreshUi();
+          },
+          ACCEPT_REJECT_CALL_TIME_OUT_IN_MILLIS);
+    }
+  }
 }
diff --git a/java/com/android/incallui/AnswerScreenPresenterStub.java b/java/com/android/incallui/AnswerScreenPresenterStub.java
index d02a181..2f9e608 100644
--- a/java/com/android/incallui/AnswerScreenPresenterStub.java
+++ b/java/com/android/incallui/AnswerScreenPresenterStub.java
@@ -50,4 +50,9 @@
 
   @Override
   public void updateWindowBackgroundColor(@FloatRange(from = -1f, to = 1.0f) float progress) {}
+
+  @Override
+  public boolean isActionTimeout() {
+    return false;
+  }
 }
diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java
index f758a96..e36d9cf 100644
--- a/java/com/android/incallui/CallButtonPresenter.java
+++ b/java/com/android/incallui/CallButtonPresenter.java
@@ -306,6 +306,9 @@
   @Override
   public void toggleCameraClicked() {
     LogUtil.i("CallButtonPresenter.toggleCameraClicked", "");
+    if (mCall == null) {
+      return;
+    }
     Logger.get(mContext)
         .logCallImpression(
             DialerImpression.Type.IN_CALL_SCREEN_SWAP_CAMERA,
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java
index cd06793..67b9177 100644
--- a/java/com/android/incallui/CallCardPresenter.java
+++ b/java/com/android/incallui/CallCardPresenter.java
@@ -44,9 +44,9 @@
 import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.ActivityCompat;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.multimedia.MultimediaData;
@@ -245,7 +245,7 @@
 
   @Override
   public void onStateChange(InCallState oldState, InCallState newState, CallList callList) {
-    LogUtil.v("CallCardPresenter.onStateChange", "" + newState);
+    LogUtil.v("CallCardPresenter.onStateChange", "oldState: %s, newState: %s", oldState, newState);
     if (mInCallScreen == null) {
       return;
     }
@@ -374,6 +374,7 @@
 
   @Override
   public void onEnrichedCallSessionUpdate() {
+    LogUtil.enterBlock("CallCardPresenter.onEnrichedCallSessionUpdate");
     updatePrimaryDisplayInfo();
   }
 
@@ -864,6 +865,14 @@
       return;
     }
 
+    if (mSecondary.isMergeInProcess()) {
+      LogUtil.i(
+          "CallCardPresenter.updateSecondaryDisplayInfo",
+          "secondary call is merge in process, clearing info");
+      mInCallScreen.setSecondary(SecondaryInfo.createEmptySecondaryInfo(mIsFullscreen));
+      return;
+    }
+
     if (mSecondary.isConferenceCall()) {
       mInCallScreen.setSecondary(
           new SecondaryInfo(
diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java
index d7eea79..fdfba3b 100644
--- a/java/com/android/incallui/ContactInfoCache.java
+++ b/java/com/android/incallui/ContactInfoCache.java
@@ -33,6 +33,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.os.UserManagerCompat;
 import android.telecom.TelecomManager;
 import android.telephony.PhoneNumberUtils;
@@ -596,7 +597,7 @@
 
     // This will only be true for emergency numbers
     if (info.photoResource != 0) {
-      cce.photo = context.getResources().getDrawable(info.photoResource);
+      cce.photo = ContextCompat.getDrawable(context, info.photoResource);
     } else if (info.isCachedPhotoCurrent) {
       if (info.cachedPhoto != null) {
         cce.photo = info.cachedPhoto;
diff --git a/java/com/android/incallui/ExternalCallNotifier.java b/java/com/android/incallui/ExternalCallNotifier.java
index 051392e..f01a294 100644
--- a/java/com/android/incallui/ExternalCallNotifier.java
+++ b/java/com/android/incallui/ExternalCallNotifier.java
@@ -29,6 +29,7 @@
 import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
 import android.telecom.Call;
 import android.telecom.PhoneAccount;
 import android.telecom.VideoProfile;
@@ -41,8 +42,7 @@
 import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.contacts.common.util.BitmapUtil;
 import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.notification.NotificationChannelId;
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCallDelegate;
 import com.android.incallui.call.ExternalCallList;
@@ -59,9 +59,10 @@
 public class ExternalCallNotifier implements ExternalCallList.ExternalCallListener {
 
   /** Tag used with the notification manager to uniquely identify external call notifications. */
-  private static final int NOTIFICATION_ID = R.id.notification_external_call;
+  private static final String NOTIFICATION_TAG = "EXTERNAL_CALL";
 
-  private static final String NOTIFICATION_GROUP = "ExternalCallNotifier";
+  private static final int NOTIFICATION_SUMMARY_ID = -1;
+
   private final Context mContext;
   private final ContactInfoCache mContactInfoCache;
   private Map<Call, NotificationInfo> mNotifications = new ArrayMap<>();
@@ -188,15 +189,14 @@
 
     NotificationManager notificationManager =
         (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-    notificationManager.cancel(
-        String.valueOf(mNotifications.get(call).getNotificationId()), NOTIFICATION_ID);
+    notificationManager.cancel(NOTIFICATION_TAG, mNotifications.get(call).getNotificationId());
 
     mNotifications.remove(call);
 
     if (mShowingSummary && mNotifications.size() <= 1) {
       // Where a summary notification is showing and there is now not enough notifications to
       // necessitate a summary, cancel the summary.
-      notificationManager.cancel(NOTIFICATION_GROUP, NOTIFICATION_ID);
+      notificationManager.cancel(NOTIFICATION_TAG, NOTIFICATION_SUMMARY_ID);
       mShowingSummary = false;
 
       // If there is still a single call requiring a notification, re-post the notification as a
@@ -237,7 +237,7 @@
     builder.setOngoing(true);
     // Make the notification prioritized over the other normal notifications.
     builder.setPriority(Notification.PRIORITY_HIGH);
-    builder.setGroup(NOTIFICATION_GROUP);
+    builder.setGroup(NOTIFICATION_TAG);
 
     boolean isVideoCall = VideoProfile.isVideo(info.getCall().getDetails().getVideoState());
     // Set the content ("Ongoing call on another device")
@@ -251,9 +251,9 @@
     builder.setLargeIcon(info.getLargeIcon());
     builder.setColor(mContext.getResources().getColor(R.color.dialer_theme_color));
     builder.addPerson(info.getPersonReference());
-
-    NotificationChannelManager.applyChannel(
-        builder, mContext, Channel.EXTERNAL_CALL, info.getCall().getDetails().getAccountHandle());
+    if (BuildCompat.isAtLeastO()) {
+      builder.setChannelId(NotificationChannelId.DEFAULT);
+    }
 
     // Where the external call supports being transferred to the local device, add an action
     // to the notification to initiate the call pull process.
@@ -286,20 +286,16 @@
     Notification.Builder publicBuilder = new Notification.Builder(mContext);
     publicBuilder.setSmallIcon(R.drawable.quantum_ic_call_white_24);
     publicBuilder.setColor(mContext.getResources().getColor(R.color.dialer_theme_color));
-
-    NotificationChannelManager.applyChannel(
-        publicBuilder,
-        mContext,
-        Channel.EXTERNAL_CALL,
-        info.getCall().getDetails().getAccountHandle());
+    if (BuildCompat.isAtLeastO()) {
+      publicBuilder.setChannelId(NotificationChannelId.DEFAULT);
+    }
 
     builder.setPublicVersion(publicBuilder.build());
     Notification notification = builder.build();
 
     NotificationManager notificationManager =
         (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-    notificationManager.notify(
-        String.valueOf(info.getNotificationId()), NOTIFICATION_ID, notification);
+    notificationManager.notify(NOTIFICATION_TAG, info.getNotificationId(), notification);
 
     if (!mShowingSummary && mNotifications.size() > 1) {
       // If the number of notifications shown is > 1, and we're not already showing a group summary,
@@ -310,12 +306,13 @@
       summary.setOngoing(true);
       // Make the notification prioritized over the other normal notifications.
       summary.setPriority(Notification.PRIORITY_HIGH);
-      summary.setGroup(NOTIFICATION_GROUP);
+      summary.setGroup(NOTIFICATION_TAG);
       summary.setGroupSummary(true);
       summary.setSmallIcon(R.drawable.quantum_ic_call_white_24);
-      NotificationChannelManager.applyChannel(
-          summary, mContext, Channel.EXTERNAL_CALL, info.getCall().getDetails().getAccountHandle());
-      notificationManager.notify(NOTIFICATION_GROUP, NOTIFICATION_ID, summary.build());
+      if (BuildCompat.isAtLeastO()) {
+        summary.setChannelId(NotificationChannelId.DEFAULT);
+      }
+      notificationManager.notify(NOTIFICATION_TAG, NOTIFICATION_SUMMARY_ID, summary.build());
       mShowingSummary = true;
     }
   }
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index bda003c..6ea31fc 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -35,9 +35,9 @@
 import android.view.MotionEvent;
 import android.view.View;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.ActivityCompat;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
 import com.android.incallui.answer.bindings.AnswerBindings;
@@ -630,12 +630,22 @@
       AnswerScreen answerScreen = getAnswerScreen();
       if (answerScreen.getCallId().equals(call.getId())
           && answerScreen.isVideoCall() == call.isVideoCall()
-          && answerScreen.isVideoUpgradeRequest() == isVideoUpgradeRequest) {
+          && answerScreen.isVideoUpgradeRequest() == isVideoUpgradeRequest
+          && !answerScreen.isActionTimeout()) {
+        LogUtil.d(
+            "InCallActivity.showAnswerScreenFragment",
+            "answer fragment exists for same call and has NOT been accepted/rejected/timed out");
         return false;
       }
-      LogUtil.i(
-          "InCallActivity.showAnswerScreenFragment",
-          "answer fragment exists but arguments do not match");
+      if (answerScreen.isActionTimeout()) {
+        LogUtil.i(
+            "InCallActivity.showAnswerScreenFragment",
+            "answer fragment exists but has been accepted/rejected and timed out");
+      } else {
+        LogUtil.i(
+            "InCallActivity.showAnswerScreenFragment",
+            "answer fragment exists but arguments do not match");
+      }
       hideAnswerScreenFragment(transaction);
     }
 
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index 7c30001..0bfd67e 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -1014,6 +1014,13 @@
     }
   }
 
+  public void refreshUi() {
+    if (mInCallActivity != null) {
+      // Re-evaluate which fragment is being shown.
+      mInCallActivity.onPrimaryCallStateChanged();
+    }
+  }
+
   public void addInCallUiListener(InCallUiListener listener) {
     mInCallUiListeners.add(listener);
   }
diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java
index 1653334..d2b0297 100644
--- a/java/com/android/incallui/InCallServiceImpl.java
+++ b/java/com/android/incallui/InCallServiceImpl.java
@@ -23,7 +23,6 @@
 import android.telecom.CallAudioState;
 import android.telecom.InCallService;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.incallui.audiomode.AudioModeProvider;
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.ExternalCallList;
@@ -82,7 +81,7 @@
     InCallPresenter.getInstance().onServiceBind();
     InCallPresenter.getInstance().maybeStartRevealAnimation(intent);
     TelecomAdapter.getInstance().setInCallService(this);
-    if (ConfigProviderBindings.get(this).getBoolean("enable_return_to_call_bubble", false)) {
+    if (ReturnToCallController.isEnabled(this)) {
       returnToCallController = new ReturnToCallController(this);
     }
 
diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java
index 4cb6aaf..314aa45 100644
--- a/java/com/android/incallui/ReturnToCallController.java
+++ b/java/com/android/incallui/ReturnToCallController.java
@@ -24,6 +24,7 @@
 import android.support.annotation.VisibleForTesting;
 import android.telecom.CallAudioState;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialershared.bubble.Bubble;
 import com.android.dialershared.bubble.BubbleInfo;
@@ -57,6 +58,10 @@
   private final PendingIntent toggleMute;
   private final PendingIntent endCall;
 
+  public static boolean isEnabled(Context context) {
+    return !ConfigProviderBindings.get(context).getBoolean("disable_return_to_call_bubble", false);
+  }
+
   public ReturnToCallController(Context context) {
     this.context = context;
 
@@ -108,6 +113,7 @@
   private Bubble startNewBubble() {
     if (!Bubble.canShowBubbles(context)) {
       LogUtil.i("ReturnToCallController.startNewBubble", "can't show bubble, no permission");
+      context.startActivity(Bubble.getRequestPermissionIntent(context));
       return null;
     }
     Bubble returnToCallBubble = Bubble.createBubble(context, generateBubbleInfo());
@@ -156,12 +162,14 @@
   }
 
   private BubbleInfo generateBubbleInfo() {
+    Intent activityIntent = InCallActivity.getIntent(context, false, false, false);
+    activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     return BubbleInfo.builder()
         .setPrimaryColor(context.getResources().getColor(R.color.dialer_theme_color, null))
-        .setPrimaryIcon(Icon.createWithResource(context, R.drawable.quantum_ic_call_white_24))
-        .setPrimaryAction(
-            PendingIntent.getActivity(
-                context, 0, InCallActivity.getIntent(context, false, false, false), 0))
+        .setPrimaryIcon(Icon.createWithResource(context, R.drawable.on_going_call))
+        .setStartingYPosition(
+            context.getResources().getDimensionPixelOffset(R.dimen.return_to_call_initial_offset_y))
+        .setPrimaryIntent(PendingIntent.getActivity(context, 0, activityIntent, 0))
         .setActions(generateActions())
         .build();
   }
@@ -176,7 +184,7 @@
             .setIcon(Icon.createWithResource(context, speakerButtonInfo.icon))
             .setName(context.getText(speakerButtonInfo.label))
             .setChecked(speakerButtonInfo.isChecked)
-            .setAction(speakerButtonInfo.checkable ? toggleSpeaker : showSpeakerSelect)
+            .setIntent(speakerButtonInfo.checkable ? toggleSpeaker : showSpeakerSelect)
             .build());
 
     actions.add(
@@ -184,21 +192,21 @@
             .setIcon(Icon.createWithResource(context, R.drawable.quantum_ic_mic_off_white_24))
             .setName(context.getText(R.string.incall_label_mute))
             .setChecked(audioState.isMuted())
-            .setAction(toggleMute)
+            .setIntent(toggleMute)
             .build());
     actions.add(
         Action.builder()
             .setIcon(Icon.createWithResource(context, R.drawable.quantum_ic_call_end_white_24))
             .setName(context.getText(R.string.incall_label_end_call))
-            .setAction(endCall)
+            .setIntent(endCall)
             .build());
     return actions;
   }
 
   @NonNull
-  private PendingIntent createActionIntent(String actionToggleSpeaker) {
+  private PendingIntent createActionIntent(String action) {
     Intent toggleSpeaker = new Intent(context, ReturnToCallActionReceiver.class);
-    toggleSpeaker.setAction(actionToggleSpeaker);
+    toggleSpeaker.setAction(action);
     return PendingIntent.getBroadcast(context, 0, toggleSpeaker, 0);
   }
 }
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 229f08c..458df51 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -28,7 +28,6 @@
 import android.Manifest;
 import android.app.ActivityManager;
 import android.app.Notification;
-import android.app.Notification.Builder;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -70,8 +69,7 @@
 import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.enrichedcall.Session;
 import com.android.dialer.multimedia.MultimediaData;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.notification.NotificationChannelId;
 import com.android.dialer.oem.MotorolaUtils;
 import com.android.dialer.util.DrawableConverter;
 import com.android.incallui.ContactInfoCache.ContactCacheEntry;
@@ -93,6 +91,9 @@
 public class StatusBarNotifier
     implements InCallPresenter.InCallStateListener, EnrichedCallManager.StateChangedListener {
 
+  private static final String NOTIFICATION_TAG = "STATUS_BAR_NOTIFIER";
+  private static final int NOTIFICATION_ID = 1;
+
   // Notification types
   // Indicates that no notification is currently showing.
   private static final int NOTIFICATION_NONE = 0;
@@ -147,7 +148,7 @@
 
     NotificationManager notificationManager =
         backupContext.getSystemService(NotificationManager.class);
-    notificationManager.cancel(R.id.notification_ongoing_call);
+    notificationManager.cancel(NOTIFICATION_TAG, NOTIFICATION_ID);
   }
 
   private static int getWorkStringFromPersonalString(int resId) {
@@ -173,12 +174,6 @@
     return PendingIntent.getBroadcast(context, 0, intent, 0);
   }
 
-  private static void setColorized(@NonNull Builder builder) {
-    if (BuildCompat.isAtLeastO()) {
-      builder.setColorized(true);
-    }
-  }
-
   /** Creates notifications according to the state we receive from {@link InCallPresenter}. */
   @Override
   @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
@@ -226,7 +221,7 @@
     }
     if (mCurrentNotification != NOTIFICATION_NONE) {
       LogUtil.i("StatusBarNotifier.cancelNotification", "cancel");
-      mNotificationManager.cancel(R.id.notification_ongoing_call);
+      mNotificationManager.cancel(NOTIFICATION_TAG, NOTIFICATION_ID);
     }
     mCurrentNotification = NOTIFICATION_NONE;
   }
@@ -365,13 +360,13 @@
     LogUtil.i("StatusBarNotifier.buildAndSendNotification", "notificationType=" + notificationType);
     switch (notificationType) {
       case NOTIFICATION_INCOMING_CALL:
-        NotificationChannelManager.applyChannel(
-            builder, mContext, Channel.INCOMING_CALL, accountHandle);
+        if (BuildCompat.isAtLeastO()) {
+          builder.setChannelId(NotificationChannelId.INCOMING_CALL);
+        }
         configureFullScreenIntent(builder, createLaunchPendingIntent(true /* isFullScreen */));
         // Set the notification category and bump the priority for incoming calls
         builder.setCategory(Notification.CATEGORY_CALL);
         // This will be ignored on O+ and handled by the channel
-        //noinspection deprecation
         builder.setPriority(Notification.PRIORITY_MAX);
         if (mCurrentNotification != NOTIFICATION_INCOMING_CALL) {
           LogUtil.i(
@@ -379,18 +374,20 @@
               "Canceling old notification so this one can be noisy");
           // Moving from a non-interuptive notification (or none) to a noisy one. Cancel the old
           // notification (if there is one) so the fullScreenIntent or HUN will show
-          mNotificationManager.cancel(R.id.notification_ongoing_call);
+          mNotificationManager.cancel(NOTIFICATION_TAG, NOTIFICATION_ID);
         }
         break;
       case NOTIFICATION_INCOMING_CALL_QUIET:
-        NotificationChannelManager.applyChannel(
-            builder, mContext, Channel.ONGOING_CALL, accountHandle);
+        if (BuildCompat.isAtLeastO()) {
+          builder.setChannelId(NotificationChannelId.ONGOING_CALL);
+        }
         break;
       case NOTIFICATION_IN_CALL:
-        setColorized(publicBuilder);
-        setColorized(builder);
-        NotificationChannelManager.applyChannel(
-            builder, mContext, Channel.ONGOING_CALL, accountHandle);
+        if (BuildCompat.isAtLeastO()) {
+          publicBuilder.setColorized(true);
+          builder.setColorized(true);
+          builder.setChannelId(NotificationChannelId.ONGOING_CALL);
+        }
         break;
     }
 
@@ -436,7 +433,7 @@
         "displaying notification for " + notificationType);
 
     try {
-      mNotificationManager.notify(R.id.notification_ongoing_call, notification);
+      mNotificationManager.notify(NOTIFICATION_TAG, NOTIFICATION_ID, notification);
     } catch (RuntimeException e) {
       // TODO(b/34744003): Move the memory stats into silent feedback PSD.
       ActivityManager activityManager = mContext.getSystemService(ActivityManager.class);
@@ -660,13 +657,17 @@
       return R.drawable.quantum_ic_videocam_white_24;
     } else if (call.hasProperty(PROPERTY_HIGH_DEF_AUDIO)
         && MotorolaUtils.shouldShowHdIconInNotification(mContext)) {
-      // Normally when a call is ongoing the status bar displays an icon of a phone with animated
-      // lines. This is a helpful hint for users so they know how to get back to the call.
-      // For Sprint HD calls, we replace this icon with an icon of a phone with a HD badge.
-      // This is a carrier requirement.
+      // Normally when a call is ongoing the status bar displays an icon of a phone. This is a
+      // helpful hint for users so they know how to get back to the call. For Sprint HD calls, we
+      // replace this icon with an icon of a phone with a HD badge. This is a carrier requirement.
       return R.drawable.ic_hd_call;
     }
-    return R.anim.on_going_call;
+    // If ReturnToCall is enabled, use the static icon. The animated one will show in the bubble.
+    if (ReturnToCallController.isEnabled(mContext)) {
+      return R.drawable.quantum_ic_call_white_24;
+    } else {
+      return R.drawable.on_going_call;
+    }
   }
 
   /** Returns the message to use with the notification. */
@@ -823,13 +824,9 @@
         "will show \"answer\" action in the incoming call Notification");
     PendingIntent answerVoicePendingIntent =
         createNotificationPendingIntent(mContext, ACTION_ANSWER_VOICE_INCOMING_CALL);
-    // We put animation resources in "anim" folder instead of "drawable", which causes Android
-    // Studio to complain.
-    // TODO: Move "anim" resources to "drawable" as recommended in AnimationDrawable doc?
-    //noinspection ResourceType
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(mContext, R.anim.on_going_call),
+                Icon.createWithResource(mContext, R.drawable.quantum_ic_call_white_24),
                 getActionText(
                     R.string.notification_action_answer, R.color.notification_action_accept),
                 answerVoicePendingIntent)
@@ -927,7 +924,7 @@
     builder.setOngoing(true);
     builder.setOnlyAlertOnce(true);
     // This will be ignored on O+ and handled by the channel
-    //noinspection deprecation
+    // noinspection deprecation
     builder.setPriority(Notification.PRIORITY_HIGH);
 
     return builder;
diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java
index 31999ef..bd98370 100644
--- a/java/com/android/incallui/VideoCallPresenter.java
+++ b/java/com/android/incallui/VideoCallPresenter.java
@@ -27,9 +27,9 @@
 import android.view.Surface;
 import android.view.SurfaceView;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.incallui.InCallPresenter.InCallDetailsListener;
 import com.android.incallui.InCallPresenter.InCallOrientationListener;
 import com.android.incallui.InCallPresenter.InCallStateListener;
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java
index 6be7930..4431053 100644
--- a/java/com/android/incallui/answer/impl/AnswerFragment.java
+++ b/java/com/android/incallui/answer/impl/AnswerFragment.java
@@ -216,6 +216,7 @@
   private void performAnswerAndRelease() {
     restoreAnswerAndReleaseButtonAnimation();
     answerScreenDelegate.onAnswerAndReleaseCall();
+    buttonAcceptClicked = true;
   }
 
   private void restoreAnswerAndReleaseButtonAnimation() {
@@ -359,6 +360,11 @@
   }
 
   @Override
+  public boolean isActionTimeout() {
+    return (buttonAcceptClicked || buttonRejectClicked) && answerScreenDelegate.isActionTimeout();
+  }
+
+  @Override
   @NonNull
   public String getCallId() {
     return Assert.isNotNull(getArguments().getString(ARG_CALL_ID));
@@ -526,6 +532,7 @@
     if (!isAdded()) {
       return;
     }
+    LogUtil.enterBlock("AnswerFragment.updateDataFragment");
     Fragment current = getChildFragmentManager().findFragmentById(R.id.incall_data_container);
     Fragment newFragment = null;
 
@@ -542,6 +549,7 @@
           || !Objects.equals(((MultimediaFragment) current).getSubject(), subject)
           || !Objects.equals(((MultimediaFragment) current).getImageUri(), imageUri)
           || !Objects.equals(((MultimediaFragment) current).getLocation(), location)) {
+        LogUtil.i("AnswerFragment.updateDataFragment", "Replacing multimedia fragment");
         // Needs replacement
         newFragment =
             MultimediaFragment.newInstance(
@@ -553,12 +561,14 @@
     } else if (shouldShowAvatar()) {
       // Needs Avatar
       if (!(current instanceof AvatarFragment)) {
+        LogUtil.i("AnswerFragment.updateDataFragment", "Replacing avatar fragment");
         // Needs replacement
         newFragment = new AvatarFragment();
       }
     } else {
       // Needs empty
       if (current != null) {
+        LogUtil.i("AnswerFragment.updateDataFragment", "Removing current fragment");
         getChildFragmentManager().beginTransaction().remove(current).commitNow();
       }
       contactGridManager.setAvatarImageView(null, 0, false);
@@ -1021,7 +1031,7 @@
   }
 
   private void updateImportanceBadgeVisibility() {
-    if (!isAdded()) {
+    if (!isAdded() || getView() == null) {
       return;
     }
 
diff --git a/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java b/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java
index 1d3d7ef..5e83dfc 100644
--- a/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java
+++ b/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java
@@ -20,7 +20,7 @@
 import android.hardware.SensorEvent;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 
 /** An classifier trying to determine whether it is a human interacting with the phone or not. */
 class HumanInteractionClassifier extends Classifier {
diff --git a/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java b/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java
index 9c33b5d..94cf893 100644
--- a/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java
+++ b/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java
@@ -23,8 +23,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.util.DialerUtils;
 import com.android.incallui.util.AccessibilityUtil;
 
diff --git a/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java b/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java
index 3b4512c..204c4e1 100644
--- a/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java
+++ b/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java
@@ -25,8 +25,8 @@
 import android.text.TextUtils;
 import android.widget.Toast;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.logging.DialerImpression.Type;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.util.DialerUtils;
diff --git a/java/com/android/incallui/answer/protocol/AnswerScreen.java b/java/com/android/incallui/answer/protocol/AnswerScreen.java
index 8bcad6e..5ad5002 100644
--- a/java/com/android/incallui/answer/protocol/AnswerScreen.java
+++ b/java/com/android/incallui/answer/protocol/AnswerScreen.java
@@ -30,6 +30,8 @@
 
   boolean allowAnswerAndRelease();
 
+  boolean isActionTimeout();
+
   void setTextResponses(List<String> textResponses);
 
   boolean hasPendingDialogs();
diff --git a/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java b/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
index 10a3413..5d2c415 100644
--- a/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
+++ b/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
@@ -46,4 +46,7 @@
    * @param progress float from -1 to 1. -1 is fully rejected, 1 is fully accepted, and 0 is neutral
    */
   void updateWindowBackgroundColor(@FloatRange(from = -1f, to = 1.0f) float progress);
+
+  /** Returns true if any answer/reject action timed out. */
+  boolean isActionTimeout();
 }
diff --git a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
index fe4ae9f..536a470 100644
--- a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
+++ b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
@@ -20,8 +20,8 @@
 import android.hardware.display.DisplayManager;
 import android.os.PowerManager;
 import android.view.Display;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.call.DialerCallListener;
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java
index 3876ca6..269fcd6 100644
--- a/java/com/android/incallui/call/CallList.java
+++ b/java/com/android/incallui/call/CallList.java
@@ -299,6 +299,8 @@
         LogUtil.w(
             "CallList.onCallRemoved", "Removing call not previously disconnected " + call.getId());
       }
+
+      call.onRemovedFromCallList();
     }
 
     if (!hasLiveCall()) {
@@ -566,7 +568,8 @@
    *
    * @param call The call to update.
    */
-  private void onUpdateCall(DialerCall call) {
+  @VisibleForTesting
+  void onUpdateCall(DialerCall call) {
     LogUtil.d("CallList.onUpdateCall", String.valueOf(call));
     if (!mCallById.containsKey(call.getId()) && call.isExternalCall()) {
       // When a regular call becomes external, it is removed from the call list, and there may be
diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index 12edb07..88e0dbb 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -47,8 +47,8 @@
 import com.android.dialer.callintent.CallIntentParser;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
@@ -163,6 +163,9 @@
    */
   private boolean isRemotelyHeld;
 
+  /** Indicates whether this call is currently in the process of being merged into a conference. */
+  private boolean isMergeInProcess;
+
   /**
    * Indicates whether the phone account associated with this call supports specifying a call
    * subject.
@@ -265,6 +268,14 @@
             case TelephonyManagerCompat.EVENT_NOTIFY_INTERNATIONAL_CALL_ON_WFC:
               notifyInternationalCallOnWifi();
               break;
+            case TelephonyManagerCompat.EVENT_MERGE_START:
+              LogUtil.i("DialerCall.onConnectionEvent", "merge start");
+              isMergeInProcess = true;
+              break;
+            case TelephonyManagerCompat.EVENT_MERGE_COMPLETE:
+              LogUtil.i("DialerCall.onConnectionEvent", "merge complete");
+              isMergeInProcess = false;
+              break;
             default:
               break;
           }
@@ -970,6 +981,10 @@
     return isRemotelyHeld;
   }
 
+  public boolean isMergeInProcess() {
+    return isMergeInProcess;
+  }
+
   public boolean isIncoming() {
     return mLogState.isIncoming;
   }
@@ -1274,6 +1289,11 @@
     }
   }
 
+  void onRemovedFromCallList() {
+    // Ensure we clean up when this call is removed.
+    mVideoTechManager.dispatchRemovedFromCallList();
+  }
+
   /**
    * Specifies whether a number is in the call history or not. {@link #CALL_HISTORY_STATUS_UNKNOWN}
    * means there is no result.
@@ -1493,7 +1513,10 @@
 
       videoTechs.add(
           new LightbringerTech(
-              LightbringerComponent.get(call.mContext).getLightbringer(), call, phoneNumber));
+              LightbringerComponent.get(call.mContext).getLightbringer(),
+              call,
+              call.mTelecomCall,
+              phoneNumber));
     }
 
     VideoTech getVideoTech() {
@@ -1517,6 +1540,12 @@
         videoTech.onCallStateChanged(context, newState);
       }
     }
+
+    void dispatchRemovedFromCallList() {
+      for (VideoTech videoTech : videoTechs) {
+        videoTech.onRemovedFromCallList();
+      }
+    }
   }
 
   /** Called when canned text responses have been loaded. */
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java
index d329dc9..e102ee0 100644
--- a/java/com/android/incallui/incall/impl/InCallFragment.java
+++ b/java/com/android/incallui/incall/impl/InCallFragment.java
@@ -42,6 +42,7 @@
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.multimedia.MultimediaData;
+import com.android.dialer.widget.LockableViewPager;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter;
 import com.android.incallui.contactgrid.ContactGridManager;
diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
index 4443141..c06f709 100644
--- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
+++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
@@ -1,4 +1,19 @@
 <?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
+  -->
 <FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -62,7 +77,7 @@
         android:layout_height="match_parent"/>
     </LinearLayout>
 
-    <com.android.incallui.incall.impl.LockableViewPager
+    <com.android.dialer.widget.LockableViewPager
       android:id="@+id/incall_pager"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
diff --git a/java/com/android/incallui/incall/protocol/PrimaryInfo.java b/java/com/android/incallui/incall/protocol/PrimaryInfo.java
index c170950..761dd9a 100644
--- a/java/com/android/incallui/incall/protocol/PrimaryInfo.java
+++ b/java/com/android/incallui/incall/protocol/PrimaryInfo.java
@@ -104,13 +104,14 @@
     return String.format(
         Locale.US,
         "PrimaryInfo, number: %s, name: %s, location: %s, label: %s, "
-            + "photo: %s, photoType: %d, isPhotoVisible: %b",
+            + "photo: %s, photoType: %d, isPhotoVisible: %b, MultimediaData: %s",
         LogUtil.sanitizePhoneNumber(number),
         LogUtil.sanitizePii(name),
         LogUtil.sanitizePii(location),
         label,
         photo,
         photoType,
-        isContactPhotoShown);
+        isContactPhotoShown,
+        multimediaData);
   }
 }
diff --git a/java/com/android/incallui/res/anim/on_going_call.xml b/java/com/android/incallui/res/drawable/on_going_call.xml
similarity index 61%
rename from java/com/android/incallui/res/anim/on_going_call.xml
rename to java/com/android/incallui/res/drawable/on_going_call.xml
index 3a2e2ba..438ba82 100644
--- a/java/com/android/incallui/res/anim/on_going_call.xml
+++ b/java/com/android/incallui/res/drawable/on_going_call.xml
@@ -1,4 +1,20 @@
 <?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
+  -->
+
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android"
   android:oneshot="false">
   <item
@@ -28,4 +44,4 @@
   <item
     android:drawable="@drawable/ic_ongoing_phone_24px_09"
     android:duration="200"/>
-</animation-list>
\ No newline at end of file
+</animation-list>
diff --git a/java/com/android/incallui/res/values-af/strings.xml b/java/com/android/incallui/res/values-af/strings.xml
index 5dacaaa..7d260c3 100644
--- a/java/com/android/incallui/res/values-af/strings.xml
+++ b/java/com/android/incallui/res/values-af/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Gemiste oproep vanaf <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Oproep aan die gang"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Voortdurende werkoproep"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Voortdurende Wi-Fi-oproep"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Voortdurende Wi-Fi-werkoproep"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Voortdurende Wi-Fi-oproep"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Voortdurende Wi-Fi-werkoproep"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Hou aan"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Inkomende oproep"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkomende oproep met foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Belangrike inkomende oproep met foto, boodskap en ligging"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Belangrike inkomende oproep met aanhegsels"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkomende werkoproep"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Inkomende Wi-Fi-oproep"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Inkomende Wi-Fi-werkoproep"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Inkomende Wi-Fi-oproep"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Inkomende Wi-Fi-werkoproep"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Inkomende verdagte strooipos-oproep"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Inkomende videoversoek"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Geen diens nie"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Neem video-oproep"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Om \'n oproep te maak, skakel eers vliegtuigmodus af."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nie geregistreer op netwerk nie."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Sellulêre netwerk nie beskikbaar nie."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobiele netwerk nie beskikbaar nie."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Voer \'n geldige nommer in om \'n oproep te maak."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan nie bel nie."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Begin MMI-volgorde…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Beëindig oproep"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferensie-oproep"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Besig met oproep"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Gaan voort met oproep deur sellulêre data te gebruik …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Kon nie na Wi-Fi-netwerk oorskakel nie"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video-oproep sal op sellulêre netwerk bly. Standaard datakoste kan dalk geld."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Gaan voort met oproep deur mobiele data te gebruik ..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kon nie na Wi-Fi-netwerk oorskakel nie"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video-oproep sal op mobiele netwerk bly. Standaard datakoste kan dalk geld."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Moenie dit weer wys nie"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-am/strings.xml b/java/com/android/incallui/res/values-am/strings.xml
index 249447f..f09fd63 100644
--- a/java/com/android/incallui/res/values-am/strings.xml
+++ b/java/com/android/incallui/res/values-am/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"ያልተመለሰ ጥሪ ከ<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"እየተካሄደ ያለ ጥሪ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"በሂደት ላይ ያለ የሥራ ጥሪ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"በሂደት ላይ ያለ የWi-Fi ጥሪ"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"በሂደት ላይ ያለ የWi-Fi የሥራ ጥሪ"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"በሂደት ላይ ያለ የWi-Fi ጥሪ"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"በሂደት ላይ ያለ የWi-Fi የሥራ ጥሪ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ያዝናቆይ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ገቢ ጥሪ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ገቢ ጥሪ ከፎቶ ጋር"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"አስፈላጊ ገቢ ጥሪ ከፎቶ፣ መልዕክት እና አካባቢ ጋር"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"አስፈላጊ ገቢ ጥሪ ከአባሪ ጋር"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ገቢ የሥራ ጥሪ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ገቢ የWi-Fi ጥሪ"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ገቢ የWi-Fi የሥራ ጥሪ"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"ገቢ የWi-Fi ጥሪ"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"ገቢ የWi-Fi የሥራ ጥሪ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"መጪ የተጠረጠረ የአይፈለጌ መልዕክት ጥሪ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ገቢ የቪዲዮ ጥያቄ"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"ምንም አገልግሎት የለም"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"የቪዲዮ ጥሪ ውሰድ"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"ለመደወል፣ መጀመሪያየአውሮፕላኑን ሁነታ አጥፋ።"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"በአውታረ መረቡ ላይ አልተመዘገበም።"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"የተንቀሳቃሽ ስልክ አውታረ መረብ አይገኝም።"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"የተንቀሳቃሽ ስልክ አውታረ መረብ አይገኝም።"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"አንድ ጥሪ ለማድረግ የሚሰራ ቁጥር ያስገቡ።"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"መደወል አልተቻለም።"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"የMMI sequence…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ጥሪ ጨርስ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"የስብሰባ ጥሪ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"በጥሪ ላይ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ሴሉላር ውሂብ በመጠቀም ጥሪውን በመቀጠል ላይ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"ወደ Wi-Fi አውታረ መረብ መቀየር አልተቻለም።"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"የቪዲዮ ጥሪ በሴሉላር አውታረመረቡ ላይ ይቆያል። መደበኛ የውሂብ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ።"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"የተንቀሳቃሽ ስልክ ውሂብን በመጠቀም ጥሪውን በመቀጠል ላይ…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ወደ Wi-Fi አውታረ መረብ መቀየር አልተቻለም"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"የቪዲዮ ጥሪ በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ ይቆያል። መደበኛ የውሂብ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ።"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ይህን በድጋሚ አታሳይ"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ar/strings.xml b/java/com/android/incallui/res/values-ar/strings.xml
index 7c3585c..3928291 100644
--- a/java/com/android/incallui/res/values-ar/strings.xml
+++ b/java/com/android/incallui/res/values-ar/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"مكالمة فائتة من <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"مكالمة حالية"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"مكالمة عمل جارية"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"‏اتصال جارٍ عبر Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏مكالمة عمل جارية عبر اتصال Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"‏اتصال جارٍ عبر Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"‏مكالمة عمل جارية عبر اتصال Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"معلقة"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"مكالمة واردة"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"مكالمة واردة مع صورة"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"مكالمة واردة مهمة مع صورة ورسالة وموقع"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"مكالمة واردة مهمة مع مرفقات"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"مكالمة عمل واردة"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏اتصال وارد عبر Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏مكالمة عمل واردة عبر اتصال Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"‏اتصال وارد عبر Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"‏مكالمة عمل واردة عبر اتصال Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"مكالمة واردة يشتبه في كونها غير مرغوب فيها"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"طلب فيديو وارد"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"لا خدمة"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"الرد على مكالمة فيديو"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"لإجراء مكالمة، أوقف تشغيل وضع الطائرة أولاً."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"غير مسجل على الشبكة."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"شبكة الجوّال غير متاحة."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"شبكة الجوال غير متاحة."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"لإجراء مكالمة، أدخل رقمًا صالحًا."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"يتعذر الاتصال."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"‏جارٍ بدء تسلسل MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"إنهاء الاتصال"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"مكالمة جماعية"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"قيد الاتصال"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"جارٍ استكمال المكالمة باستخدام بيانات الجوّال…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"‏تعذر التبديل إلى شبكة Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ستظل مكالمة الفيديو على شبكة الجوّال. قد يتم فرض رسوم على البيانات القياسية للشبكة."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"جارٍ استكمال المكالمة باستخدام بيانات الجوّال…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏تعذر التبديل إلى شبكة Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ستظل مكالمة الفيديو جارية على شبكة الجوال. قد يتم تطبيق رسوم قياسية على استخدام البيانات."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"عدم إظهار هذا مرة أخرى"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-az/strings.xml b/java/com/android/incallui/res/values-az/strings.xml
index dc43014..168dd07 100644
--- a/java/com/android/incallui/res/values-az/strings.xml
+++ b/java/com/android/incallui/res/values-az/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> tərəfindən zəng buraxılıb"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Davam edən zəng"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Davam edən iş çağrısı"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Davam edən Wi-Fi zəngi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Davam edən Wi-Fi iş çağrısı"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Davam edən Wi-Fi zəngi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Davam edən Wi-Fi iş zəngi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Gözləmə mövqeyində"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Gələn zəng"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Foto ilə gələn zəng"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Foto, mesaj və məkan ilə gələn vacib zəng"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Qoşma ilə gələn vacib zəng"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Daxil olan iş çağrısı"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Gələn Wi-Fi zəngi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Daxil olan Wi-Fi iş çağrısı"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Gələn Wi-Fi zəngi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Gələn Wi-Fi iş zəngi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Şübhəli spam zəngi"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Gələn video çağrı"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Xidmət yoxdur"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Video Zəngə cavab verin"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Zəng etmək üçün ilk olaraq Uçuş Rejimini söndürün."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Şəbəkədə qeydə alınmayıb."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobil şəbəkə əlçatan deyil"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobil şəbəkə əlçatımlı deyil."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Zəngi yerləşdirmək üçün düzgün nömrə daxil edin."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Zəng etmək mümkün deyil."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI başlanma ardıcıllığı…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Zəngi sonlandırın"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konfrans zəngi"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Çağrıda"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Mobil data istifadə edərək zəng davam edir…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi şəbəkəsinə qoşulmaq olmadı"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video zəng mobil şəbəkə üzərində qalacaq. Standart data rüsumları tətbiq oluna bilər."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Mobil data istifadə edərək zəngə davam edin…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi şəbəkəsinə qoşulmaq olmadı"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video zəng mobil şəbəkədə qalacaq. Standard data xərcləri tətbiq edilə bilər."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Bunu bi rdaha göstərməyin"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/res/values-b+sr+Latn/strings.xml
index 3dddf65..de2ad86 100644
--- a/java/com/android/incallui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/res/values-b+sr+Latn/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Propušten poziv od: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Aktuelni poziv"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Tekući poziv za Work"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Tekući Wi-Fi poziv"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Tekući poziv za Work preko Wi-Fi-ja"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Wi‑Fi poziv u toku"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Wi‑Fi poslovni poziv u toku"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv sa slikom"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan dolazni poziv sa slikom, porukom i lokacijom"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv sa prilozima"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poziv za Work"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dolazni Wi-Fi poziv"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dolazni poziv za Work preko Wi-Fi-ja"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Dolazni Wi‑Fi poziv"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Dolazni Wi‑Fi poslovni poziv"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Sumnja na nepoželjan dolazni poziv"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Zahtev za dolazni video poziv"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Nema usluge"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Preuzmi video poziv"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Da biste uputili poziv, prvo isključite režim rada u avionu."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nije registrovano na mreži."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilna mreža nije dostupna."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilna mreža nije dostupna."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Da biste uputili poziv, unesite važeći broj."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Poziv nije uspeo."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Pokretanje MMI sekvence"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Završite poziv"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferencijski poziv"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"U pozivu"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Poziv se nastavlja pomoću mobilnih podataka…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Prebacivanje na Wi-Fi mrežu nije uspelo"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video poziv će ostati na mobilnoj mreži. Mogu da važe standardne naknade za prenos podataka."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poziv se nastavlja pomoću mobilnih podataka…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Prebacivanje na Wi‑Fi mrežu nije uspelo"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video poziv će ostati na mobilnoj mreži. Važe standardne naknade za prenos podataka."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne prikazuj ovo ponovo"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-be/strings.xml b/java/com/android/incallui/res/values-be/strings.xml
index 46b5d39..274cac1 100644
--- a/java/com/android/incallui/res/values-be/strings.xml
+++ b/java/com/android/incallui/res/values-be/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Прапушчаны выклiк ад <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Бягучы выклік"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Бягучы выклік па працы"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Бягучы выклік праз Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Бягучы выклік па працы праз Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Бягучы выклік праз Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Бягучы выклік па працы праз Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"У чаканні"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Уваходны выклік"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Уваходны выклік з фота"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важны выклік з фота, паведамленнем і месцам"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важны ўваходны выклік з далучэннямі"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Уваходны выклік па працы"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Уваходны выклік праз Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Уваходны выклік па працы праз Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Уваходны выклік праз Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Уваходны выклік па працы праз Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Уваходны выклiк ад абанента, якога падазраваюць у спаме"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Запыт уваходнага відэавыкліку"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Не абслугоўваецца"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Прыняць відэавыклік"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Каб зрабіць выклік, спачатку выключыце рэжым \"У самалёце\"."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Не зарэгістраваны ў сетцы."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Мабільная сетка недаступная."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Мабільная сетка недаступная."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Каб зрабіць выклік, увядзіце сапраўдны нумар."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Выклік немагчымы."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Пачатак паслядоўнасці MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завяршыць выклік"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Канферэнц-выклік"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"У выкліку"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Працягваецца выклік з выкарыстаннем сотавай перадачы даных…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Немагчыма пераключыцца на сетку Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Відэавыклік застанецца ў мабільнай сетцы. Можа спаганяцца стандартная аплата за перадачу даных."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Працягваецца выклік з выкарыстаннем мабільнай перадачы даных…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Немагчыма пераключыцца на сетку Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Відэавыклік застанецца ў мабільнай сетцы. Можа спаганяцца стандартная аплата за перадачу даных."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Больш не паказваць"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-bg/strings.xml b/java/com/android/incallui/res/values-bg/strings.xml
index 84bffa0..b3c1f3f 100644
--- a/java/com/android/incallui/res/values-bg/strings.xml
+++ b/java/com/android/incallui/res/values-bg/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Пропуснато обаждане от <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Текущо обаждане"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Текущо служебно обаждане"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Текущо обаждане през Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Текущо служебно обаждане през Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Текущо обаждане през Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Текущо служебно обаждане през Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Задържане на обаждането"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Вх. обаждане"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Входящо обаждане със снимка"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важно обаждане с местоположение, снимка, съобщение"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важно входящо обаждане с прикачени файлове"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Входящо служебно обаждане"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Входящо обаждане през Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Входящо служебно обаждане през Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Входящо обаждане през Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Входящо служебно обаждане през Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Входящо обаждане – възможен спам"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Входяща заявка за видеовръзка"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Няма покритие"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Приемане на видеообаждането"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Първо изключете самолетния режим, за да може да осъществите обаждане."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Няма регистрация в мрежата."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Няма достъп до клетъчната мрежа."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Няма мобилна мрежа."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"За да извършите обаждане, въведете валиден номер."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Не може да се извърши обаждане."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Стартира се последователността MMI…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Край на обаждането"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конферентно обаждане"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"В разговор"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Обаждането продължава през мобилната връзка за данни…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Превключването към Wi-Fi мрежа не бе възможно"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видеообаждането ще остане в мобилната мрежа. Важат стандартните тарифи за данни."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Обаждането продължава през мобилната връзка за данни…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Превключването към Wi-Fi мрежа не бе възможно"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видеообаждането ще остане в мобилната мрежа. Важат стандартните тарифи за данни."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Това да не се показва отново"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-bn/strings.xml b/java/com/android/incallui/res/values-bn/strings.xml
index fc93830..a964f81 100644
--- a/java/com/android/incallui/res/values-bn/strings.xml
+++ b/java/com/android/incallui/res/values-bn/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> এর থেকে মিসড কল"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"চালু থাকা কল"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"চলমান কাজের কল"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"চলমান ওয়াই-ফাই কল"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"চলমান ওয়াই-ফাই কাজের কল"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"চালু থাকা ওয়াই-ফাই কল"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"চালু থাকা ওয়াই-ফাই কাজের কল"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"সাময়িকভাবে স্থগিত রাখা হয়েছে"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ইনকামিং কল"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ফটো সহ ইনকামিং কল"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ফটো, বার্তা এবং অবস্থান সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"সংযুক্তিগুলি সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"আগত কাজের কল"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"আগত ওয়াই-ফাই কল"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"আগত ওয়াই-ফাই কাজের কল"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"আগত ওয়াই-ফাই কল"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"আগত ওয়াই-ফাই কাজের কল"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"আগত সন্দেহভাজন স্প্যাম কল"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"আগত ভিডিও অনুরোধ"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"কোনো পরিষেবা নেই"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"ভিডিও কলটি নিন"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"একটি কল করতে, প্রথমে বিমান মোড বন্ধ করুন৷"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"নেটওয়ার্কে নিবন্ধিত নয়৷"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"সেলুলার নেটওয়ার্ক উপলব্ধ নয়।"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"মোবাইল নেটওয়ার্ক উপলব্ধ নয়৷"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"কোনো কল স্থাপন করতে, একটি বৈধ নম্বর লিখুন৷"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"কল করা যাবে না৷"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI ক্রম চালু হচ্ছে…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"কল কেটে দিন"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"কনফারেন্স কল"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"কলে থাকাকালীন"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"সেলুলার ডেটা ব্যবহার করে কল করা চালিয়ে যান…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi নেটওয়ার্কে পাল্টানো গেল না"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ভিডিও কল সেলুলার নেটওয়ার্কেই থাকবে৷ স্ট্যান্ডার্ড চার্জ প্রযোজ্য হতে পারে৷"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"মোবাইল ডেটা ব্যবহার করে কল করা চালিয়ে যান…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ওয়াই-ফাই নেটওয়ার্কে পাল্টানো গেল না"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ভিডিও কল মোবাইল নেটওয়ার্কেই থাকবে৷ স্ট্যান্ডার্ড ডেটা চার্জ প্রযোজ্য হতে পারে৷"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"এটি আমাকে আর দেখাবেন না"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-bs/strings.xml b/java/com/android/incallui/res/values-bs/strings.xml
index c695080..996eb98 100644
--- a/java/com/android/incallui/res/values-bs/strings.xml
+++ b/java/com/android/incallui/res/values-bs/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Propušteni poziv od kontakta <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Poziv u toku"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Poslovni poziv u toku"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi poziv u toku"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Wi-Fi poslovni poziv u toku"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Wi-Fi poziv je u toku"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Wi-Fi poslovni poziv je u toku"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv s fotografijom"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan poziv s fotografijom, porukom i lokacijom"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv s prilozima"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poslovni poziv"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dolazni Wi-Fi poziv"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dolazni Wi-Fi poslovni poziv"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Dolazni Wi-Fi poziv"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Dolazni Wi-Fi poslovni poziv"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Mogući neželjeni dolazni poziv"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Zahtjev za dolazni videopoziv"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Nema mreže"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Primi videopoziv"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Da uputite poziv, isključite Način rada u avionu."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nije registrirano na mreži."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilna mreža nije dostupna."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilna mreža nije dostupna."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Da uputite poziv, upišite važeći broj."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Nije moguće pozvati."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Pokretanje MMI sekvence u toku…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Prekini poziv"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferencijski poziv"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Poziv u toku"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Poziv se nastavlja pomoću mobilnih podataka…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videopoziv će ostati na mobilnoj mreži. Mogu nastati standardni troškovi prijenosa podataka."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Nastavak poziva prijenosom mobilnih podataka…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videopoziv će ostati na mobilnoj mreži. Mogu nastati standardni troškovi prijenosa podataka."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne prikazuj ponovo"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ca/strings.xml b/java/com/android/incallui/res/values-ca/strings.xml
index ad34b00..f4d56a2 100644
--- a/java/com/android/incallui/res/values-ca/strings.xml
+++ b/java/com/android/incallui/res/values-ca/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Trucada perduda de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Trucada en procés"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Trucada de feina en curs"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Trucada Wi-Fi en curs"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Trucada de feina per Wi-Fi en curs"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Trucada per Wi-Fi en curs"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Trucada de feina per Wi-Fi en curs"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Trucada entrant"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Trucada entrant amb foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Trucada entrant important amb foto, missatge i ubicació"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Trucada entrant important amb fitxers adjunts"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Trucada de feina entrant"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Trucada Wi-Fi entrant"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Trucada de feina per Wi-Fi entrant"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Trucada per Wi-Fi entrant"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Trucada de feina per Wi-Fi entrant"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Presumpta trucada brossa entrant"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Sol·licitud de vídeo entrant"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Sense servei"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Accepta la videotrucada"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Per fer una trucada, primer apagueu el mode d\'avió."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"No registrat a la xarxa."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"La xarxa mòbil no està disponible."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"La xarxa mòbil no està disponible."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Per realitzar una trucada, introdueix un número vàlid."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"No es pot trucar."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"S\'està iniciant la seqüència MMI..."</string>
@@ -125,7 +125,7 @@
     <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Segons les nostres sospites, l\'autor de la trucada és un emissor de contingut brossa. Si ens equivoquem, toca NO ÉS BROSSA per informar-nos-en."</string>
     <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloqueja i marca"</string>
     <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Afegeix un contacte"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"No és contingut brossa"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"No és una trucada brossa"</string>
     <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloqueja el número"</string>
     <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Afegeix als contactes"</string>
     <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloqueja i marca com a brossa"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalitza la trucada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conferència"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"En una trucada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"S\'està continuant la trucada mitjançant dades mòbils…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"No s\'ha pogut canviar a la xarxa Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videotrucada es mantindrà a la xarxa mòbil. És possible que s\'hi apliquin càrrecs de dades estàndard."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"S\'està continuant la trucada mitjançant dades mòbils…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"No s\'ha pogut canviar a la xarxa Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videotrucada continuarà a la xarxa mòbil. És possible que s\'hi apliquin càrrecs de dades estàndard."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No ho tornis a mostrar"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-cs/strings.xml b/java/com/android/incallui/res/values-cs/strings.xml
index 9d69cfa..e604a52 100644
--- a/java/com/android/incallui/res/values-cs/strings.xml
+++ b/java/com/android/incallui/res/values-cs/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Zmeškaný hovor od volajícího <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Probíhající hovor"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Probíhající pracovní hovor"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Probíhající volání přes Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Probíhající pracovní hovor (Wi-Fi)"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Probíhající hovor přes Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Probíhající pracovní hovor přes Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Přidržený hovor"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Příchozí hovor"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Příchozí hovor s fotkou"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Důležitý přích. hovor s fotkou, zprávou a polohou"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Důležitý příchozí hovor s přílohami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Příchozí pracovní hovor"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Příchozí volání přes Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Příchozí pracovní hovor (Wi-Fi)"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Příchozí hovor přes Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Příchozí pracovní hovor přes Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"U příchozího hovoru máme podezření, že se jedná o spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Příchozí žádost o videohovor"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Žádný signál"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Převést videohovor sem"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Chcete-li telefonovat, vypněte nejprve režim Letadlo."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Přihlášení k síti nebylo úspěšné."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilní síť je nedostupná."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilní síť je nedostupná."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Chcete-li uskutečnit hovor, zadejte platné telefonní číslo."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Hovor nelze uskutečnit."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Spouštění sekvence MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ukončit hovor"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferenční hovor"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Probíhá hovor"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Hovor pokračuje přes mobilní data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Přepnutí na síť Wi-Fi se nezdařilo"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videohovor zůstane na mobilní síti. Za datový přenos mohou být účtovány standardní poplatky."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Hovor pokračuje přes mobilní data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Přepnutí na síť Wi-Fi se nezdařilo"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videohovor zůstane na mobilní síti. Za datový přenos mohou být účtovány standardní poplatky."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Tuto zprávu příště nezobrazovat"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-da/strings.xml b/java/com/android/incallui/res/values-da/strings.xml
index 19de783..fbf7927 100644
--- a/java/com/android/incallui/res/values-da/strings.xml
+++ b/java/com/android/incallui/res/values-da/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Ubesvaret opkald fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Igangværende opkald"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Igangværende opkald i forbindelse med arbejde"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Igangværende opkald via Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Igangværende Wi-Fi-opkald i forbindelse med arbejde"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Igangværende Wi-Fi-opkald"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Igangværende Wi-Fi-opkald i forbindelse med arbejde"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ventende"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Indgående opkald"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Indgående opkald med billede"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Vigtigt opkald med billede, besked og placering"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Vigtigt indgående opkald med vedhæftede filer"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Indgående opkald i forbindelse med arbejde"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Indgående opkald via Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Indgående Wi-Fi-opkald i forbindelse med arbejde"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Indgående Wi-Fi-opkald"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Indgående Wi-Fi-opkald i forbindelse med arbejde"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Indgående formodet spamopkald"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Indgående videoanmodning"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Ingen dækning"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Besvar videoopkald"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Slå Flytilstand fra først for at foretage et opkald."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ikke registreret på netværk."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilnetværket er ikke tilgængeligt."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilnetværket er ikke tilgængeligt."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Indtast et gyldigt nummer for at foretage et opkald."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan ikke ringe op."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Starter MMI-sekvens ..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Afslut opkald"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonmøde"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Opkald i gang"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Fortsætter opkaldet med mobildata…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Der kan ikke skiftes til Wi-Fi-netværk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videoopkaldet bliver ved med at bruge mobilnetværket. Du skal muligvis betale et standardgebyr for data."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Opkaldet fortsættes med mobildata…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Du kunne ikke skifte til Wi-Fi-netværk"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videoopkaldet bliver ved med at bruge mobilnetværket. Du skal muligvis betale et standardgebyr for data."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Vis ikke dette igen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-de/strings.xml b/java/com/android/incallui/res/values-de/strings.xml
index a5f9602..0dce345 100644
--- a/java/com/android/incallui/res/values-de/strings.xml
+++ b/java/com/android/incallui/res/values-de/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Verpasster Anruf von <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Aktueller Anruf"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Aktueller geschäftlicher Anruf"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Aktiver WLAN-Anruf"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Aktueller geschäftlicher WLAN-Anruf"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Aktiver WLAN-Anruf"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Aktiver geschäftlicher WLAN-Anruf"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Gehaltener Anruf"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Eingehender Anruf"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Eingehender Anruf mit Foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Wichtiger eingehender Anruf mit Foto, Nachricht und Standort"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Wichtiger eingehender Anruf mit Anhängen"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Eingehender geschäftlicher Anruf"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Eingehender WLAN-Anruf"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Eingehender geschäftlicher WLAN-Anruf"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Eingehender WLAN-Anruf"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Eingehender geschäftlicher WLAN-Anruf"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Verdacht auf eingehenden Spam-Anruf"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Eingehende Videoanfrage"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"kein Dienst"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Videoanruf übernehmen"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Deaktiviere zunächst den Flugmodus, um einen Anruf zu tätigen."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nicht in Netzwerk registriert."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilfunknetz nicht verfügbar"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilfunknetz ist nicht verfügbar."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Gib eine gültige Nummer ein."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Anruf nicht möglich."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI-Sequenz wird gestartet..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Anruf beenden"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonkonferenz"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Anruf"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Anruf wird über Mobildaten fortgesetzt…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wechseln zu WLAN nicht möglich"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Der Videoanruf erfolgt weiter über das Mobilfunknetz. Es können Standardgebühren für die Datenübertragung anfallen."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Anruf wird über mobile Daten fortgesetzt…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wechseln zu WLAN nicht möglich"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Der Videoanruf erfolgt weiter über das Mobilfunknetz. Es können Standardgebühren für die Datenübertragung anfallen."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Meldung nicht mehr anzeigen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-el/strings.xml b/java/com/android/incallui/res/values-el/strings.xml
index 8ff6d2f..bc39e2a 100644
--- a/java/com/android/incallui/res/values-el/strings.xml
+++ b/java/com/android/incallui/res/values-el/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Αναπάντητη κλήση από <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Κλήση σε εξέλιξη"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Κλήση εργασίας σε εξέλιξη"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Κλήση Wi-Fi σε εξέλιξη"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Κλήση εργασίας μέσω Wi-Fi σε εξέλιξη"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Κλήση Wi-Fi σε εξέλιξη"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Κλήση εργασίας μέσω Wi-Fi σε εξέλιξη"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Σε αναμονή"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Εισερχόμενη κλήση"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Εισερχόμενη κλήση με φωτογραφία"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Σημαντική εισερχ. κλήση με φωτο, μήνυμα, τοποθεσία"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Σημαντική εισερχόμενη κλήση με συνημμένα"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Εισερχόμενη κλήση εργασίας"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Εισερχόμενη κλήση μέσω Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Εισερχόμενη κλήση εργασίας μέσω Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Εισερχόμενη κλήση μέσω Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Εισερχόμενη κλήση εργασίας μέσω Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Πιθανώς ανεπιθύμητη εισερχόμενη κλήση"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Αίτημα εισερχόμενου βίντεο"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Δίκτυο μη διαθέσιμο"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Λήψη βιντεοκλήσης"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Για να πραγματοποιήσετε μια κλήση, απενεργοποιήστε πρώτα τη λειτουργία πτήσης."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Δεν έχετε εγγραφεί στο δίκτυο."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Το δίκτυο κινητής τηλεφωνίας δεν είναι διαθέσιμο."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Το δίκτυο κινητής τηλεφωνίας δεν είναι διαθέσιμο."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Για να πραγματοποιήσετε μια κλήση, εισαγάγετε έναν έγκυρο αριθμό."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Δεν είναι δυνατή η κλήση."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Έναρξη ακολουθίας MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Τερματισμός κλήσης"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Κλήση συνδιάσκεψης"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Σε κλήση"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Συνέχεια κλήσης με χρήση δεδομένων κινητής τηλεφωνίας…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Δεν ήταν δυνατή η εναλλαγή σε δίκτυο Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Η βιντεοκλήση θα παραμείνει σε δίκτυο δεδομένων κινητής τηλεφωνίας; Ενδέχεται να ισχύουν βασικές χρεώσεις δεδομένων."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Συνέχιση κλήσης με χρήση δεδομένων κινητής τηλεφωνίας…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Δεν ήταν δυνατή η εναλλαγή σε δίκτυο Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Η βιντεοκλήση θα παραμείνει σε δίκτυο δεδομένων κινητής τηλεφωνίας; Ενδέχεται να ισχύουν βασικές χρεώσεις δεδομένων."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Να μην εμφανιστεί ξανά αυτό"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-en-rAU/strings.xml b/java/com/android/incallui/res/values-en-rAU/strings.xml
index 5e0d207..68509f0 100644
--- a/java/com/android/incallui/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/res/values-en-rAU/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ongoing Wi-Fi call"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Ongoing Wi‑Fi call"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Ongoing Wi‑Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
@@ -55,15 +55,15 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Incoming Wi‑Fi call"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Incoming Wi‑Fi work call"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"No service"</string>
     <string name="notification_network_selection_text" msgid="7190860774239009625">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"In-stream video"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voice"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"To place a call, first turn off Aeroplane mode."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Not registered on network."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobile network not available."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobile network not available."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"To place a call, enter a valid number."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Can\'t call."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Starting MMI sequence…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Couldn\'t switch to Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video call will remain on mobile network. Standard data charges may apply."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-en-rGB/strings.xml b/java/com/android/incallui/res/values-en-rGB/strings.xml
index 5e0d207..68509f0 100644
--- a/java/com/android/incallui/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/res/values-en-rGB/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ongoing Wi-Fi call"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Ongoing Wi‑Fi call"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Ongoing Wi‑Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
@@ -55,15 +55,15 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Incoming Wi‑Fi call"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Incoming Wi‑Fi work call"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"No service"</string>
     <string name="notification_network_selection_text" msgid="7190860774239009625">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"In-stream video"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voice"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"To place a call, first turn off Aeroplane mode."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Not registered on network."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobile network not available."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobile network not available."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"To place a call, enter a valid number."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Can\'t call."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Starting MMI sequence…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Couldn\'t switch to Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video call will remain on mobile network. Standard data charges may apply."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-en-rIN/strings.xml b/java/com/android/incallui/res/values-en-rIN/strings.xml
index 5e0d207..68509f0 100644
--- a/java/com/android/incallui/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/res/values-en-rIN/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ongoing Wi-Fi call"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Ongoing Wi‑Fi call"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Ongoing Wi‑Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
@@ -55,15 +55,15 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Incoming Wi‑Fi call"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Incoming Wi‑Fi work call"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"No service"</string>
     <string name="notification_network_selection_text" msgid="7190860774239009625">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"In-stream video"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voice"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"To place a call, first turn off Aeroplane mode."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Not registered on network."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobile network not available."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobile network not available."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"To place a call, enter a valid number."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Can\'t call."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Starting MMI sequence…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Couldn\'t switch to Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video call will remain on mobile network. Standard data charges may apply."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-es-rUS/strings.xml b/java/com/android/incallui/res/values-es-rUS/strings.xml
index d016711..b8584c7 100644
--- a/java/com/android/incallui/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/res/values-es-rUS/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Llamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Llamada en curso"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Llamada de trabajo en curso"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Llamada por Wi-Fi en curso"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Llamada de trabajo con Wi-Fi en curso"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Llamada Wi-Fi en curso"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Llamada de trabajo Wi-Fi en curso"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Llamada entrante"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Llamada entrante con foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Llamada importante con foto, mensaje y ubicación"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Llamada entrante importante con archivos adjuntos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Llamada de trabajo entrante"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Llamada por Wi-Fi entrante"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Llamada de trabajo con Wi-Fi entrante"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Llamada Wi-Fi entrante"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Llamada de trabajo Wi-Fi entrante"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Posible llamada entrante de spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitud de videollamada entrante"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Sin servicio"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Atender videollamada"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Para realizar una llamada, primero debes desactivar el modo avión."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"No registrado en la red."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Red móvil no disponible"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"La red móvil no está disponible."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para realizar una llamada, ingresa un número válido."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"No se puede realizar la llamada."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iniciar la secuencia de MMI"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalizar llamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conferencia"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"En llamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuando la llamada con datos móviles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"No se pudo cambiar a la red Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videollamada permanecerá en la red móvil. Es posible que se te cobren cargos estándar por el uso de datos."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando la llamada con datos móviles…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"No se pudo cambiar a la red Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videollamada permanecerá en la red móvil. Es posible que se te cobren cargos estándar por el uso de datos."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No volver a mostrar esto"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-es/strings.xml b/java/com/android/incallui/res/values-es/strings.xml
index 472ea99..4dc2d72 100644
--- a/java/com/android/incallui/res/values-es/strings.xml
+++ b/java/com/android/incallui/res/values-es/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Llamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Llamada en curso"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Llamada de trabajo en curso"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Llamada Wi-Fi en curso"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Llamada Wi-Fi de trabajo en curso"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Llamada por Wi-Fi en curso"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Llamada de trabajo por Wi-Fi en curso"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Llamada entrante"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Llamada entrante con foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Llamada importante con foto, mensaje y ubicación"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Llamada entrante importante con archivos adjuntos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Llamada de trabajo entrante"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Llamada Wi-Fi entrante"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Llamada Wi-Fi de trabajo entrante"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Llamada por Wi-Fi entrante"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Llamada de trabajo por Wi-Fi entrante"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Llamada entrante sospechosa de spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitud de videollamada entrante"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Sin servicio"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Atender videollamada"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Para realizar una llamada, primero debes desactivar el modo avión."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"No se ha podido conectar a la red"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"La red móvil no está disponible."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"La red móvil no está disponible."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para realizar una llamada, introduce un número válido."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"No se puede establecer la llamada."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iniciando secuencia MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalizar llamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conferencia telefónica"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"En una llamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuando la llamada con datos móviles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"No se ha podido cambiar a la red Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videollamada seguirá mediante la red móvil. Es posible que se apliquen cargos por uso de datos."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando la llamada con los datos móviles…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"No se ha podido cambiar a la red Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videollamada seguirá a través de la red móvil. Es posible que se apliquen cargos por el uso de datos."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No volver a mostrar"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-et/strings.xml b/java/com/android/incallui/res/values-et/strings.xml
index 9eaa65f..ec1b230 100644
--- a/java/com/android/incallui/res/values-et/strings.xml
+++ b/java/com/android/incallui/res/values-et/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Vastamata kõne helistajalt <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Käimasolev kõne"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Käimasolev töökõne"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Pooleliolev WiFi-kõne"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Käimasolev töökõne WiFi kaudu"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Käimasolev WiFi-kõne"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Käimasolev WiFi-töökõne"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ootel"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Sissetulev kõne"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Sissetulev kõne koos fotoga"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tähtis sisset. kõne koos foto, sõnumi ja asukohaga"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Tähtis sissetulev kõne koos manustega"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Sissetulev töökõne"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Sissetulev WiFi-kõne"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Sissetulev töökõne WiFi kaudu"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Sissetulev WiFi-kõne"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Sissetulev WiFi-töökõne"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Arvatav sissetulev rämpskõne"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Sissetulev videotaotlus"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Teenus puudub"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Alusta videokõnet"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Helistamiseks lülitage lennurežiim välja."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ei ole võrku registreeritud."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobiilsidevõrk pole saadaval."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobiilsidevõrk pole saadaval."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Helistamiseks sisestage kehtiv number."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Ei saa helistada."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI-jada alustamine ..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Kõne lõpetamine"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konverentskõne"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Pooleliolev kõne"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Kõne jätkatakse mobiilse andmeside kaudu …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ei saanud WiFi-võrgule lülitada"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videokõne jääb mobiilsidevõrku. Rakenduda võivad tavapärased andmetasud."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Kõnet jätkatakse mobiilse andmeside kaudu …"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"WiFi-võrgule ei saanud lülituda"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videokõne jääb mobiilsidevõrku. Rakenduda võivad tavapärased andmesidetasud."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ära seda enam näita"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-eu/strings.xml b/java/com/android/incallui/res/values-eu/strings.xml
index 4db9e10..c8fe005 100644
--- a/java/com/android/incallui/res/values-eu/strings.xml
+++ b/java/com/android/incallui/res/values-eu/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Deitzaile honen dei bat galdu duzu: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Abian den deia"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Laneko dei bat abian da"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi deia abian"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Wi-Fi bidezko laneko dei bat abian da"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Wi-Fi bidezko deia"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Wi-Fi bidezko laneko deia"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Zain"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Sarrerako deia"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Jasotako deia, argazkia duena"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Jasotako dei garrant., arg., mez. eta kok. dituena"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Jasotako dei garrantzitsua, eranskinak dituena"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Laneko dei bat jaso da"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Sarrerako Wi-Fi deia"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Wi-Fi bidezko laneko dei bat jaso da"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Jasotako Wi-Fi bidezko deia"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Jasotako Wi-Fi bidezko laneko deia"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Ustezko spam-deia jaso duzu"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Sarrerako bideo-eskaera"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Ez dago zerbitzurik"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Erantzun bideo-deiari"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Dei bat egiteko, Hegaldi modua desaktibatu behar duzu."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ez dago sarean erregistratuta."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Sare mugikorra ez dago erabilgarri."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Sare mugikorra ez dago erabilgarri."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Deitzeko, idatzi balio duen zenbaki bat."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Ezin da deitu."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI sekuentzia hasten…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Amaitu deia"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferentzia-deia"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Deia abian da"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Datu-konexioren bidez jarraitzen ari da deia egiten…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ezin izan da aldatu Wi-Fi sarera"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Datu mugikorren bidez egiten jarraituko da bideo-deia. Baliteke datuak erabiltzearen ondorioz ohiko kostuak kobratzea."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Datu-konexioaren bidez egiten jarraituko da deia…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ezin izan da aldatu Wi-Fi sarera"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Datu-konexioaren bidez egiten jarraituko da bideo-deia. Baliteke datuak erabiltzearen ondorioz ohiko kostuak kobratzea."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ez erakutsi berriro"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fa/strings.xml b/java/com/android/incallui/res/values-fa/strings.xml
index f816bd0..a36d164 100644
--- a/java/com/android/incallui/res/values-fa/strings.xml
+++ b/java/com/android/incallui/res/values-fa/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"تماس بی‌پاسخ از <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"تماس جاری"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"تماس کاری خروجی"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"‏تماس از طریق Wi-Fi در حال انجام است"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏تماس کاری Wi-Fi خروجی"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"‏تماس Wi-Fi درحال انجام"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"‏تماس کاری Wi-Fi درحال انجام"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"در انتظار"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"تماس ورودی"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"تماس ورودی به همراه عکس"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"تماس ورودی مهم به همراه عکس، پیام و مکان"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"تماس ورودی مهم به همراه پیوست"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"تماس کاری ورودی"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏تماس Wi-Fi ورودی"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏تماس کاری Wi-Fi ورودی"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"‏تماس Wi-Fi ورودی"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"‏تماس کاری Wi-Fi ورودی"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"تماس هرزنامه احتمالی ورودی"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"درخواست تماس ویدئویی ورودی"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"بدون سرویس"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"انتقال تماس ویدئویی"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"برای برقراری یک تماس، ابتدا حالت هواپیما را خاموش کنید."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"در شبکه ثبت نشده است."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"شبکه تلفن همراه در دسترس نیست."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"شبکه تلفن همراه دردسترس نیست."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"برای برقراری تماس، یک شماره معتبر وارد کنید."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"نمی‌توانید تماس بگیرید."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"‏شروع ترتیب MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"پایان تماس"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"تماس کنفرانسی"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"در تماس"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ادامه تماس با استفاده از داده شبکه تلفن همراه..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"‏به شبکه Wi-Fi جابه‌جا نشد"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"تماس ویدئویی همچنان از شبکه تلفن همراه استفاده می‌کند. هزینه‌های داده استاندارد اعمال می‌شود."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ادامه تماس با استفاده از داده شبکه همراه…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏جابجایی به شبکه Wi-Fi انجام نشد"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"تماس ویدیویی همچنان ازطریق شبکه تلفن همراه انجام می‌شود. ممکن است هزینه‌های استاندارد داده اعمال شود."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"دوباره نشان داده نشود"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fi/strings.xml b/java/com/android/incallui/res/values-fi/strings.xml
index 995e7a3..f13ff26 100644
--- a/java/com/android/incallui/res/values-fi/strings.xml
+++ b/java/com/android/incallui/res/values-fi/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Vastaamaton puhelu: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Käynnissä oleva puhelu"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Käynnissä oleva työpuhelu"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Käynnissä oleva Wi-Fi-puhelu"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Käynnissä oleva Wi-Fi-työpuhelu"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Käynnissä oleva Wi-Fi-puhelu"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Käynnissä oleva Wi-Fi-työpuhelu"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Pidossa"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Saapuva puhelu"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Kuvan sisältävä saapuva puhelu"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tärkeä liitteitä sisältävä saapuva puhelu"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Tärkeä liitteitä sisältävä saapuva puhelu"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Saapuva työpuhelu"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Saapuva Wi-Fi-puhelu"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Saapuva Wi-Fi-työpuhelu"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Saapuva Wi-Fi-puhelu"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Saapuva Wi-Fi-työpuhelu"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Tämä puhelu saattaa olla häirikköpuhelu."</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Saapuva videopyyntö"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Katvealueella"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Vastaa videopuheluun"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Poista lentokonetila käytöstä ennen puhelun soittamista."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ei rekisteröity verkkoon."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Matkapuhelinverkko ei ole käytettävissä."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobiilidataverkko ei ole käytettävissä."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Soita antamalla kelvollinen numero."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Puhelua ei voi soittaa."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Aloitetaan MMI-koodisekvenssiä..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Päätä puhelu"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Puhelinneuvottelu"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Puhelu käynnissä"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Jatketaan puhelua mobiilitiedonsiirron avulla…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Siirtyminen Wi-Fi-verkkoon epäonnistui."</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videopuhelu soitetaan matkapuhelinverkon kautta. Operaattori voi veloittaa tiedonsiirrosta hinnastonsa mukaan."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Jatketaan puhelua mobiilidatayhteydellä…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Vaihto Wi-Fi-verkkoon epäonnistui."</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videopuhelu soitetaan mobiilidatayhteyden kautta. Operaattori voi veloittaa tiedonsiirrosta."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Älä näytä tätä uudelleen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fr-rCA/strings.xml b/java/com/android/incallui/res/values-fr-rCA/strings.xml
index 6f4d8da..e83658d 100644
--- a/java/com/android/incallui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/res/values-fr-rCA/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Appel manqué de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Appel en cours"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Appel en cours - travail"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Appel Wi-Fi en cours"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Appel Wi-Fi en cours - travail"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Appel Wi-Fi en cours"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Appel professionnel Wi-Fi en cours"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En attente"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Appel entrant"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Appel entrant avec photo"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Appel important avec photo, message et position"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Appel entrant important avec pièces jointes"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Appel entrant - travail"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Appel Wi-Fi entrant"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Appel Wi-Fi entrant - travail"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Appel Wi-Fi entrant"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Appel professionnel Wi-Fi entrant"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"L\'appel entrant est suspect"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Demande de vidéo reçue"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Aucun service"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Répondre à l\'appel vidéo"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Veuillez désactiver le mode Avion avant de passer un appel."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Non enregistré sur le réseau"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Réseau cellulaire non disponible."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Réseau cellulaire non disponible."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Pour faire un appel, entrez un numéro valide."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Impossible d\'appeler."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Lancement de la séquence IHM..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Mettre fin à l\'appel"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conférence téléphonique"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Appel en cours"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Poursuite de l\'appel à l\'aide de données cellulaires en cours…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Impossible de passer à un réseau Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"L\'appel vidéo restera sur le réseau cellulaire. Des frais de données standards peuvent s\'appliquer."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poursuite de l\'appel utilisant des données mobiles en cours…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Impossible de passer à un réseau Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"L\'appel vidéo restera sur le réseau cellulaire. Des frais de données standards peuvent s\'appliquer."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne plus afficher"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fr/strings.xml b/java/com/android/incallui/res/values-fr/strings.xml
index c77fc19..162c242 100644
--- a/java/com/android/incallui/res/values-fr/strings.xml
+++ b/java/com/android/incallui/res/values-fr/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Appel manqué de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Appel en cours"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Appel professionnel en cours"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Appel Wi-Fi en cours"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Appel Wi-Fi professionnel en cours"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Appel Wi-Fi en cours"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Appel Wi-Fi professionnel en cours"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En attente"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Appel entrant"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Appel entrant avec photo"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Appel important avec photo, message et position"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Appel entrant important avec pièces jointes"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Appel professionnel entrant"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Appel Wi-Fi entrant"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Appel Wi-Fi professionnel entrant"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Appel Wi-Fi entrant"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Appel Wi-Fi professionnel entrant"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Appel entrant indésirable suspecté"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Demande de vidéo reçue"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Aucun service"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Répondre à l\'appel vidéo"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Veuillez d\'abord désactiver le mode Avion, afin d\'effectuer un appel."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Non enregistré sur le réseau."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Réseau mobile non disponible."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Réseau mobile non disponible"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Pour émettre un appel, veuillez saisir un numéro valide."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Impossible d\'émettre l\'appel."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Lancement de la séquence IHM..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Mettre fin à l\'appel"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conférence téléphonique"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Appel en cours"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuer l\'appel en utilisant les données mobiles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Impossible de passer au réseau Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"L\'appel vidéo va continuer sur le réseau mobile. Des frais standard liés à la consommation de données peuvent être facturés."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poursuite de l\'appel via les données mobiles…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Impossible de passer au réseau Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"L\'appel vidéo va continuer sur le réseau mobile. Des frais standards liés à la consommation de données peuvent être facturés."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne plus afficher"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-gl/strings.xml b/java/com/android/incallui/res/values-gl/strings.xml
index 53278e5..d926b1b 100644
--- a/java/com/android/incallui/res/values-gl/strings.xml
+++ b/java/com/android/incallui/res/values-gl/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Chamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada en curso"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de traballo saínte"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chamada wifi saínte"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada wifi de traballo saínte"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Chamada saínte por wifi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Chamada de traballo saínte por wifi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada entrante"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada entrante con foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada entrante importante con foto, mensaxe e localización"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada entrante importante con anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de traballo entrante"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada wifi entrante"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada wifi de traballo entrante"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Chamada entrante por wifi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Chamada de traballo entrante por wifi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chamada entrante sospeitosa de spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitude de vídeo entrante"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Sen servizo"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Responder á videochamada"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Para facer unha chamada, primeiro desactiva o modo avión."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Sen rexistro na rede"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rece móbil non dispoñible."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"A rede móbil non está dispoñible."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para realizar unha chamada, introduce un número válido."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Non se pode chamar."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iniciando secuencia MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalizar chamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conferencia telefónica"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Chamada en curso"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuando a chamada con datos móbiles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Non se puido cambiar á rede wifi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"A videochamada permanecerá na rede móbil. É posible que o operador aplique tarifas de datos estándar."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando a chamada con datos móbiles…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Non se puido cambiar á rede wifi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videochamada permanecerá na rede móbil. É posible que se apliquen tarifas de datos estándar."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Non mostrar de novo"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-gu/strings.xml b/java/com/android/incallui/res/values-gu/strings.xml
index 8b1ebe8..4a90fc5 100644
--- a/java/com/android/incallui/res/values-gu/strings.xml
+++ b/java/com/android/incallui/res/values-gu/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> નો કૉલ ચૂકી ગયાં"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"ચાલી રહેલ કૉલ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ચાલી રહેલ કાર્ય કૉલ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ચાલુ Wi-Fi કૉલ"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ચાલી રહેલ Wi-Fi કાર્ય કૉલ"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"ચાલી રહેલ Wi-Fi કૉલ"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"ચાલી રહેલ Wi-Fi કાર્ય કૉલ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"હોલ્ડ પર"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ઇનકમિંગ કૉલ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ફોટો સાથે ઇનકમિંગ કૉલ"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ફોટો, સંદેશ અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"જોડાણો સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ઇનકમિંગ કાર્ય કૉલ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ઇનકમિંગ Wi-Fi કૉલ"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ઇનકમિંગ Wi-Fi કાર્ય કૉલ"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"ઇનકમિંગ Wi-Fi કૉલ"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"ઇનકમિંગ Wi-Fi કાર્ય કૉલ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ઇનકમિંગ શંકાસ્પદ સ્પામ કૉલ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"આવનાર વિડિઓ વિનંતી"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"કોઈ સેવા નથી"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"વિડિઓ કૉલ લો"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"કૉલ કરવા માટે, પહેલાં એરપ્લેન મોડને બંધ કરો."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"નેટવર્ક પર નોંધણી કરાયેલ નથી."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"સેલ્યુલર નેટવર્ક ઉપલબ્ધ નથી."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"મોબાઇલ નેટવર્ક ઉપલબ્ધ નથી."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"કૉલ કરવા માટે, માન્ય નંબર દાખલ કરો."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"કૉલ કરી શકાતો નથી."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI અનુક્રમ પ્રારંભ કરી રહ્યાં છે…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"કૉલ સમાપ્ત કરો"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"કૉન્ફરન્સ કૉલ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"કૉલમાં"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"સેલ્યુલર ડેટાની મદદથી કૉલ ચાલુ રાખી રહ્યાં છે…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi નેટવર્ક પર સ્વિચ કરી શક્યાં નથી"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"વિડિઓ કૉલ સેલ્યુલર નેટવર્ક પર રહેશે. માનક ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"મોબાઇલ ડેટાની મદદથી કૉલ ચાલુ રાખી રહ્યાં છે…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi નેટવર્ક પર સ્વિચ કરી શક્યાં નથી"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"વિડિઓ કૉલ, મોબાઇલ નેટવર્ક પર રહેશે. માનક ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"આ ફરીથી બતાવશો નહીં"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hi/strings.xml b/java/com/android/incallui/res/values-hi/strings.xml
index 09563df..d3a4dcf 100644
--- a/java/com/android/incallui/res/values-hi/strings.xml
+++ b/java/com/android/incallui/res/values-hi/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> के छूटे कॉल"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"चल रही कॉल"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"कार्यस्थल की जारी कॉल"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"चल रहा वाई-फ़ाई कॉल"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"कार्यस्थल की जारी वाई-फ़ाई कॉल"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"जारी Wi‑Fi कॉल"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"जारी Wi‑Fi कार्य कॉल"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"होल्ड पर"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"इनकमिंग कॉल"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"फ़ोटो के साथ इनकमिंग कॉल"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"फोटो, संदेश और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"अटैचमेंट के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"कार्यस्थल की आवक कॉल"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"इनकमिंग वाई-फ़ाई कॉल"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"कार्यस्थल की वाई-फ़ाई आवक कॉल"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"इनकमिंग Wi‑Fi कॉल"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"इनकमिंग Wi‑Fi कार्य कॉल"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"संदिग्ध आवक स्पैम कॉल"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"इनकमिंग वीडियो अनुरोध"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"कोई सेवा नहीं"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"वीडियो कॉल लें"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"कॉल करने के लिए, पहले विमान मोड बंद करें."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"नेटवर्क पर पंजीकृत नहीं."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"सेल्युलर नेटवर्क उपलब्ध नहीं."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"मोबाइल नेटवर्क उपलब्ध नहीं है."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"कॉल करने के लिए, मान्‍य नंबर डालें."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"कॉल नहीं किया जा सकता."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI अनुक्रम प्रारंभ हो रहा है…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"कॉल समाप्त करें"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"कॉन्फ़्रेंस कॉल"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"कॉल में"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"सेल्युलर डेटा का उपयोग करके कॉल जारी रखा जा रहा है…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"वाई-फ़ाई नेटवर्क में नहीं बदला जा सका"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"वीडियो कॉल सेल्यूलर नेटवर्क पर बना रहेगा. मानक डेटा शुल्क लागू हो सकते हैं."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"मोबाइल डेटा का उपयोग करके कॉल जारी रखा जा रहा है…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi‑Fi नेटवर्क पर स्विच नहीं कर सका"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"वीडियो कॉल मोबाइल नेटवर्क पर बना रहेगा. मानक डेटा शुल्क लागू हो सकते हैं."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"इसे दोबारा न दिखाएं"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hr/strings.xml b/java/com/android/incallui/res/values-hr/strings.xml
index 7af1613..2d389e6 100644
--- a/java/com/android/incallui/res/values-hr/strings.xml
+++ b/java/com/android/incallui/res/values-hr/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Propušten poziv kontakta <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Poziv u tijeku"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Poslovni poziv u tijeku"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi poziv u tijeku"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Poslovni Wi-Fi poziv u tijeku"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Wi-Fi poziv u tijeku"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Poslovni Wi-Fi poziv u tijeku"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv s fotografijom"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan poziv s fotografijom, porukom i lokacijom"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv s privicima"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poslovni poziv"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dolazni Wi-Fi poziv"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dolazni poslovni Wi-Fi poziv"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Dolazni Wi-Fi poziv"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Dolazni poslovni Wi-Fi poziv"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Mogući neželjeni dolazni poziv"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Dolazni zahtjev za videopoziv"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Nema usluge"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Preuzimanje videopoziva"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Da biste uspostavili poziv, prvo isključite način rada u zrakoplovu."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nije registrirano na mreži."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilna mreža nije dostupna."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilna mreža nije dostupna."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Unesite važeći broj da biste uspostavili poziv."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Pozivanje nije moguće."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Pokretanje MMI sekvence…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Prekid poziva"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferencijski poziv"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Poziv u tijeku"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Poziv se nastavlja pomoću mobilnih podataka..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videopoziv će ostati na mobilnoj mreži. Možda ćete morati platiti podatkovni promet."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poziv se nastavlja pomoću mobilnih podataka..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videopoziv će ostati na mobilnoj mreži. Možda ćete morati platiti podatkovni promet."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne prikazuj ponovno"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hu/strings.xml b/java/com/android/incallui/res/values-hu/strings.xml
index 08d374b..fe52421 100644
--- a/java/com/android/incallui/res/values-hu/strings.xml
+++ b/java/com/android/incallui/res/values-hu/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Nem fogadott hívás: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Hívás folyamatban"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Folyamatban lévő munkahelyi hívás"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Folyamatban lévő Wi-Fi-hívás"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Folyamatban lévő munkahelyi hívás Wi-Fin keresztül"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Folyamatban lévő Wi-Fi-hívás"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Folyamatban lévő munkahelyi hívás Wi-Fin keresztül"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Tartásban"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Bejövő hívás"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Bejövő hívás fotóval"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Fontos bejövő hívás fotóval, üzenettel és hellyel"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Fontos bejövő hívás mellékletekkel"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Bejövő munkahelyi hívás"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Beérkező Wi-Fi-hívás"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Bejövő munkahelyi hívás Wi-Fin keresztül"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Beérkező Wi-Fi-hívás"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Bejövő munkahelyi hívás Wi-Fin keresztül"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Bejövő gyanús spamhívás"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Bejövő videokérés"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Nincs szolgáltatás"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Videohívás fogadása"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Híváskezdeményezéshez kapcsolja ki a Repülőgép üzemmódot."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nincs regisztrálva a hálózaton."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"A mobilhálózat nem érhető el."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"A mobilhálózat nem érhető el."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Hívásindításhoz adjon meg egy érvényes számot."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"A hívás sikertelen."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI-sorozat indítása..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Hívás befejezése"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferenciahívás"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Hívásban"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Hívás folytatása mobil-adatkapcsolaton keresztül…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nem sikerült Wi-Fi-hálózatra váltani"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"A videohívást továbbra is a mobilhálózaton folytatja. A mobilszolgáltató a normál adatforgalmi díjat számítja fel."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Hívás folytatása mobil-adatkapcsolaton keresztül…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nem sikerült Wi-Fi-hálózatra váltani"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videohívást továbbra is a mobilhálózaton folytatja. A mobilszolgáltató a normál adatforgalmi díjat számítja fel."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne jelenjen meg többé"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hy/strings.xml b/java/com/android/incallui/res/values-hy/strings.xml
index f6496d1..4287820 100644
--- a/java/com/android/incallui/res/values-hy/strings.xml
+++ b/java/com/android/incallui/res/values-hy/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Բաց թողնված զանգ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-ից"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Ընթացիկ զանգը"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ընթացիկ աշխատանքային զանգ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ընթացիկ զանգ Wi-Fi-ի միջոցով"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ընթացիկ աշխատանքային Wi-Fi զանգ"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Ընթացիկ զանգ Wi-Fi-ի միջոցով"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Ընթացիկ աշխատանքային զանգ Wi-Fi-ի միջոցով"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Սպասում"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Մուտքային զանգ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Մուտքային զանգ՝ լուսանկարով"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Կարևոր մուտքային զանգ՝ կցորդներով"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Կարևոր մուտքային զանգ՝ կցորդներով"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Մուտքային աշխատանքային զանգ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Մուտքային զանգ Wi-Fi-ի միջոցով"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Մուտքային աշխատանքային Wi-Fi զանգ"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Մուտքային զանգ Wi-Fi-ի միջոցով"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Մուտքային աշխատանքային զանգ Wi-Fi-ի միջոցով"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Մուտքային զանգը հավանաբար լցոն է"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Մուտքային տեսազանգի հայցում"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Ծառայություններ չկան"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Ընդունել տեսազանգը"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Զանգի կատարման համար նախ անջատեք թռիչքային ռեժիմը:"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ցանցում գրանցված չէ:"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Բջջային ցանցն անհասանելի է:"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Բջջային ցանցն անհասանելի է:"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Զանգ կատարելու համար մուտքագրեք ճիշտ համար:"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Հնարավոր չէ զանգել:"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Մեկնարկում է MMI հաջորդականությունը..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ավարտել զանգը"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Կոնֆերանս զանգ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Զանգ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Զանգն այժմ բջջային ինտերնետով է ընթանում…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Չհաջողվեց միանալ Wi-Fi ցանցին"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Տեսազանգը կշարունակվի բջջային ցանցով: Գանձումը կկատարվի ըստ ձեր սակագնային պլանի:"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Զանգն այժմ բջջային ինտերնետով է ընթանում…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Չհաջողվեց միանալ Wi-Fi ցանցին"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Տեսազանգը կշարունակվի բջջային ցանցով: Գանձումը կկատարվի ըստ ձեր սակագնային պլանի:"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Այլևս ցույց չտալ"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-in/strings.xml b/java/com/android/incallui/res/values-in/strings.xml
index 279e72d..6de6136 100644
--- a/java/com/android/incallui/res/values-in/strings.xml
+++ b/java/com/android/incallui/res/values-in/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Panggilan tak terjawab dari <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Panggilan yang sedang berlangsung"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Panggilan telepon kerja yang sedang berlangsung"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Panggilan Wi-Fi keluar"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Panggilan Wi-Fi kerja yang sedang berlangsung"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Panggilan Wi-Fi keluar"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Panggilan kerja Wi-Fi yang berlangsung"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ditangguhkan"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Panggilan masuk"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Panggilan masuk dengan foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Panggilan penting dengan foto, pesan, dan lokasi"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Panggilan masuk penting dengan lampiran"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Panggilan telepon kerja yang masuk"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Panggilan Wi-Fi masuk"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Panggilan telepon Wi-Fi kerja yang masuk"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Panggilan Wi-Fi masuk"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Panggilan kerja Wi-Fi masuk"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Panggilan masuk yang diduga spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Permintaan video masuk"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Tidak ada layanan"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Lakukan Video Call"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Untuk melakukan panggilan, pertama-tama matikan mode Pesawat."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Tidak terdaftar pada jaringan."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Jaringan seluler tidak tersedia."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Jaringan seluler tidak tersedia."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Untuk melakukan panggilan telepon, masukkan nomor yang valid."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Tidak dapat menelepon."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Memulai urutan MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Akhiri panggilan"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telewicara"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Sedang menelepon"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Melanjutkan panggilan menggunakan data seluler..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Tidak dapat beralih ke jaringan Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video call akan tetap di jaringan seluler. Biaya data standar mungkin berlaku."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Melanjutkan panggilan menggunakan data seluler..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Tidak dapat beralih ke jaringan Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call akan tetap di jaringan seluler. Tarif data standar mungkin berlaku."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Jangan tampilkan ini lagi"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-is/strings.xml b/java/com/android/incallui/res/values-is/strings.xml
index 795e952..8393510 100644
--- a/java/com/android/incallui/res/values-is/strings.xml
+++ b/java/com/android/incallui/res/values-is/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Ósvarað símtal frá <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Samtal í gangi"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Vinnusímtal í gangi"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi símtal stendur yfir"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Vinnusímtal í gangi um Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Wi-Fi símtal stendur yfir"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Vinnusímtal í gangi um Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Í bið"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Móttekið símtal"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Móttekið símtal með mynd"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Mikilvægt móttekið símtal með mynd, skilaboðum og staðsetningu"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Mikilvægt móttekið símtal með viðhengjum"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Vinnusímtal berst"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi símtal berst"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Vinnusímtal berst um Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Wi-Fi símtal berst"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Vinnusímtal berst um Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Símtal sem berst er hugsanlega úr ruslnúmeri"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Myndbeiðni berst"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Ekkert símasamband"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Þiggja myndsímtal"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Til að hringja símtal þarftu fyrst að slökkva á flugstillingu."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ekki skráð á símkerfi."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Farsímakerfi ekki til staðar."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Farsímakerfi ekki tiltækt."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Sláðu inn gilt númer til að hringja símtal."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Ekki hægt að hringja."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Ræsir MMI-runu…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ljúka símtali"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Símafundur"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Í símtali"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Símtal heldur áfram og notar farsímagögn…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ekki var hægt að skipta yfir á Wi-Fi-net"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Myndsímtal verður áfram á farsímaneti. Stöðluð gjöld fyrir gagnaflutning kunna að eiga við."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Símtal heldur áfram og notar farsímagögn…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ekki var hægt að skipta yfir á Wi-Fi-net"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Myndsímtal verður áfram á farsímaneti. Stöðluð gjöld fyrir gagnaflutning kunna að eiga við."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ekki birta þetta aftur"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-it/strings.xml b/java/com/android/incallui/res/values-it/strings.xml
index 836b934..ca2b4b1 100644
--- a/java/com/android/incallui/res/values-it/strings.xml
+++ b/java/com/android/incallui/res/values-it/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Chiamata senza risposta da <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Chiamata in corso"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chiamata di lavoro in corso"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chiamata Wi-Fi in corso"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chiamata di lavoro tramite Wi-Fi in corso"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Chiamata Wi-Fi in corso"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Chiamata di lavoro tramite Wi-Fi in corso"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"In attesa"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chiamata in arrivo"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chiamata in arrivo con foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chiamata importante in arrivo con foto, messaggio e posizione"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chiamata importante in arrivo con allegati"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chiamata di lavoro in arrivo"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chiamata Wi-Fi in arrivo"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chiamata di lavoro in arrivo tramite Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Chiamata Wi-Fi in arrivo"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Chiamata di lavoro tramite Wi-Fi in arrivo"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chiamata di presunto spam in arrivo"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Richiesta video in arrivo"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Nessun servizio"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Ricevi videochiamata"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Per fare una telefonata, disattiva la modalità aereo."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Non registrato sulla rete."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rete cellulare non disponibile."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Rete mobile non disponibile."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Per effettuare una chiamata, inserisci un numero valido."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Impossibile chiamare."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Inizio sequenza MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Termina chiamata"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Audioconferenza"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Chiamata in corso"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Proseguimento della chiamata utilizzando la rete dati…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Impossibile passare alla rete Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videochiamata rimarrà sulla rete cellulare. Potrebbero essere applicati costi standard per il traffico dati."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Proseguimento della chiamata utilizzando i dati mobili…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Impossibile passare alla rete Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videochiamata rimarrà sulla rete mobile. Potrebbero essere applicati costi standard per il traffico dati."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Non mostrare più questo messaggio"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-iw/strings.xml b/java/com/android/incallui/res/values-iw/strings.xml
index 195cb0f..326078a 100644
--- a/java/com/android/incallui/res/values-iw/strings.xml
+++ b/java/com/android/incallui/res/values-iw/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"שיחה שלא נענתה מאת <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"שיחה פעילה"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"שיחת עבודה פעילה"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"‏שיחת Wi-Fi מתבצעת"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏שיחת עבודה פעילה ברשת WiFi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"‏שיחת Wi-Fi פעילה"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"‏שיחת עבודה פעילה ברשת Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"בהמתנה"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"שיחה נכנסת"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"שיחה נכנסת עם תמונה"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"שיחה נכנסת חשובה עם תמונה, הודעה ומיקום"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"שיחה נכנסת חשובה עם קבצים מצורפים"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"שיחת עבודה נכנסת"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏שיחת Wi-Fi נכנסת"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏שיחת עבודה נכנסת ברשת WiFi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"‏שיחת Wi-Fi נכנסת"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"‏שיחת עבודה נכנסת ברשת Wi‑Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"השיחה הנכנסת חשודה כספאם"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"בקשת וידאו נכנסת"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"אין שירות"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"קבל את שיחת הווידאו"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"כדי להתקשר, כבה תחילה את מצב טיסה."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"לא רשום ברשת."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"רשת סלולרית אינה זמינה."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"הרשת הסלולרית אינה זמינה."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"כדי להתקשר, הזן מספר טלפון חוקי."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"לא ניתן להתקשר."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"‏מתחיל רצף MMI…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"סיים שיחה"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"שיחת ועידה"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"בשיחה"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ממשיך את השיחה באמצעות הרשת הסלולרית..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"‏לא ניתן לעבור לרשת Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"שיחת הווידאו תמשיך להיות ברשת הסלולרית. ייתכן שתחויב על ידי הספק הסלולרי בגין צריכת נתונים."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ממשיך את השיחה באמצעות הרשת הסלולרית…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏לא ניתן לעבור לרשת Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"שיחת הווידאו תמשיך להיות ברשת הסלולרית. ייתכן שתחויב על שימוש בנתונים."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"אל תציג זאת שוב"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ja/strings.xml b/java/com/android/incallui/res/values-ja/strings.xml
index 0e186fa..a54c4e1 100644
--- a/java/com/android/incallui/res/values-ja/strings.xml
+++ b/java/com/android/incallui/res/values-ja/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> さんからの不在着信"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"通話中"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"仕事の通話中"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi通話を発信中"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"仕事の Wi-Fi 通話中"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Wi-Fi 通話を発信中"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"仕事の Wi-Fi 通話を発信中"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"保留中"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"通話着信"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"着信（写真あり）"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"重要な着信（写真、メッセージ、位置情報あり）"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"重要な着信（添付ファイルあり）"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"仕事の通話が着信中"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi通話が着信中"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"仕事の Wi-Fi 通話が着信中"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Wi-Fi 通話が着信中"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"仕事の Wi-Fi 通話が着信中"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"迷惑電話の疑いがある通話を着信しています"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ビデオハングアウトリクエスト着信"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"通信サービスなし"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"ビデオハングアウトを引き継ぐ"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"機内モードをOFFにしてから発信してください。"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"ご加入の通信サービスがありません"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"モバイルネットワークが利用できません。"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"モバイル ネットワークを利用できません。"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"発信するには、有効な番号を入力してください。"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"発信できません。"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMIシーケンスを開始中..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"通話を終了"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"グループ通話"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"通話中"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"モバイルデータを使用して通話を継続しています…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi ネットワークに切り替えることができませんでした"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"引き続きモバイル ネットワークを使用してビデオ通話を続行します。通常のデータ通信料が適用される場合があります。"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"モバイルデータを使用して通話を継続しています…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi ネットワークに切り替えることができませんでした"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"引き続きモバイル ネットワークを使用してビデオハングアウトを続行します。通常のデータ通信料が適用される場合があります。"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"今後このメッセージを表示しない"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ka/strings.xml b/java/com/android/incallui/res/values-ka/strings.xml
index 6c46bd0..fed398b 100644
--- a/java/com/android/incallui/res/values-ka/strings.xml
+++ b/java/com/android/incallui/res/values-ka/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"გამოტოვებული ზარი <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-ისგან"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"მიმდინარე ზარი"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"მიმდინარე ზარი (სამსახური)"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"მიმდინარე Wi-Fi ზარი"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"მიმდინარე Wi-Fi ზარი (სამსახური)"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"მიმდინარე Wi-Fi ზარი"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"მიმდინარე Wi-Fi ზარი (სამსახური)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"შეყოვნების რეჟიმში"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"შემომავალი ზარი"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"შემომავალი ზარი ფოტოთი"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ზარი ფოტოთი, შეტყობინებით და მდებარეობით"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"მნიშვნელოვანი შემომავალი ზარი დანართებით"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"შემომავალი ზარი (სამსახური)"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"შემომავალი Wi-Fi ზარი"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"შემომავალი Wi-Fi ზარი (სამსახური)"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"შემომავალი Wi-Fi ზარი"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"შემომავალი Wi-Fi ზარი (სამსახური)"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"შემომავალი ზარი - სავარაუდოდ სპამი"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"შემომავალი ვიდეოს მოთხოვნა"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"სერვისი არ არის"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Take ვიდეო ზარი"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"ზარის განსახორციელებლად, ჯერ თვითმფრინავის რეჟიმი უნდა გამორთოთ."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"ქსელში რეგისტრირებული არ არის."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"ფიჭური ქსელი მიუწვდომელია"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"მობილური ქსელი მიუწვდომელია."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ზარის განხორციელებისათვის, შეიყვანეთ მოქმედი ნომერი."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"არ ირეკება."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI თანმიმდევრობის დაწყება…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ზარის დასრულება"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"საკონფერენციო ზარი"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"მონაწილეობს ზარში"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ზარი გრძელდება მობილური ინტერნეტის გამოყენებით…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi ქსელზე გადართვა ვერ მოხერხდა"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ვიდეოზარი ფიჭურ ქსელში დარჩება. შესაძლოა მოგიწიოთ მობილური ინტერნეტის სტანდარტული ფასის გადახდა."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ზარი გრძელდება მობილური ინტერნეტის გამოყენებით…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi ქსელზე გადართვა ვერ მოხერხდა"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ვიდეოზარი მობილური ინტერნეტის ქსელში დარჩება. შესაძლოა მოგიწიოთ მობილური ინტერნეტის სტანდარტული საფასურის გადახდა."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"აღარ მაჩვენო"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-kk/strings.xml b/java/com/android/incallui/res/values-kk/strings.xml
index 310ba4d..42ac9b0 100644
--- a/java/com/android/incallui/res/values-kk/strings.xml
+++ b/java/com/android/incallui/res/values-kk/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> қоңырауы өткізіп алынған"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Ағымдағы қоңырау"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ағымдағы жұмыс қоңырауы"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ағымдық Wi-Fi қоңырауы"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ағымдағы Wi-Fi жұмыс қоңырауы"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Қазіргі Wi-Fi қоңырауы"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Қазіргі Wi-Fi жұмыс қоңырауы"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Күтуде"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Келген қоңырау"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Сурет тіркелген кіріс қоңырау"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Сурет, хабар және орын дерегі тіркелген маңызды кіріс қоңырау"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Тіркемелері бар маңызды кіріс қоңырау"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Кіріс жұмыс қоңырауы"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Кіріс Wi-Fi қоңырауы"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Кіріс Wi-Fi жұмыс қоңырауы"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Кіріс Wi-Fi қоңырауы"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Кіріс Wi-Fi жұмыс қоңырауы"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Кіріс қоңырауы спам болуы мүмкін"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Кіріс бейне сұрау"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Қызмет көрсетілмейді"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Бейне қоңырауды бері бұру"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Қоңырау шалу үшін алдымен Ұшақ режимін өшіріңіз."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Желіде тіркелмеген."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Ұялы желі қол жетімді емес."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Мобильдік желі қолжетімсіз."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Қоңырау шалу үшін жарамды нөмірді енгізіңіз."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Қоңырау шалу мүмкін емес."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI қатарын бастау…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Қоңырауды аяқтау"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Мәжіліс қоңырауы"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Бос емес"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Қоңырау ұялы дерек арқылы жалғасады..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi желісіне қосылу мүмкін болмады"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Бейне қоңырау ұялы байланыс желісінде қалады. Стандартты деректер ақысы алынуы мүмкін."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Қоңырау мобильдік желі арқылы жалғасуда…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi желісіне қосылу мүмкін болмады"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Бейне қоңырау мобильдік желіде қалады. Стандартты мобильдік байланыс ақысы алынуы мүмкін."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Мұны қайтадан көрсетпеу"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-km/strings.xml b/java/com/android/incallui/res/values-km/strings.xml
index 4fbafef..c6238de 100644
--- a/java/com/android/incallui/res/values-km/strings.xml
+++ b/java/com/android/incallui/res/values-km/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"ខកខាន​ទទួល​ពី <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"កំពុង​បន្ត​ការ​ហៅ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ការហៅពីកន្លែងការងារកំពុងដំណើរការ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ការហៅតាម Wi-Fi កំពុងបន្ត"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ការហៅតាម Wi-Fi ពីកន្លែងការងារកំពុងដំណើរការ"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"ការហៅតាម Wi-Fi កំពុង​ដំណើរការ"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"ការហៅតាម Wi-Fi ពីកន្លែងការងារ​កំពុង​ដំណើរការ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"រង់ចាំ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ការ​ហៅ​ចូល"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ការហៅ​ចូល​​ដែល​មាន​រូបថត"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​រូបថត សារ និង​ទីតាំង"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ការហៅ​​ចូល​ដែល​សំខាន់​មាន​ឯកសារ​ភ្ជាប់"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"កំពុងហៅចូលពីកន្លែងការងារ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"មានការហៅចូលមកតាម Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"កំពុងហៅចូលពីកន្លែងការងារតាម Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"មានការហៅចូលមកតាម Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"មាន​ការ​ហៅ​ចូល​ពី​កន្លែង​ការងារ​តាម Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ការ​ហៅ​បន្លំ​​ចូល​​​ដែល​សង្ស័យ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"សំណើ​ការ​ហៅ​ជា​វីដេអូ​ចូល"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"គ្មាន​សេវា"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"ទទួល​យក​ការ​ហៅ​វីដេអូ"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"ដើម្បី​កំណត់​ការ​ហៅ ដំបូង​ត្រូវ​បិទ​របៀប​នៅ​ពេល​ជិះ​យន្តហោះ។"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"មិន​បាន​ចុះ​ឈ្មោះ​នៅ​លើ​បណ្ដាញ។"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"បណ្ដាញ​ចល័ត​មិន​អាច​ប្រើ​បាន។"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"សេវា​ទូរសព្ទ​ចល័ត​មិន​អាច​ប្រើប្រាស់​បាន។"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ដើម្បីធ្វើការហៅ បញ្ចូលលេខដែលមានសុពលភាព។"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"មិនអាចហៅបានទេ។"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"កំពុង​ចាប់ផ្ដើម​លំដាប់ MMI ..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"បញ្ចប់ការហៅ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"ហៅជា​សន្និសីទ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ស្ថិត​​ក្នុង​ការ​ហៅ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"កំពុង​បន្ត​ហៅ​ទូរស័ព្ទ​ដោយ​ប្រើ​ទិន្នន័យ​ទូរស័ព្ទ​ចល័ត..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"មិន​អាច​ប្ដូរ​ទៅ​បណ្ដាញ Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ការហៅ​ជា​វីដេអូ​នឹង​នៅ​តែ​​ស្ថិត​លើ​បណ្ដាញ​ទូរសព្ទ​ចល័ត។ អាច​​នឹង​​គិតថ្លៃ​ទិន្នន័យ​តាម​តម្លៃ​​ស្តង់ដារ។"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"កំពុង​បន្ត​ការហៅ​ទូរសព្ទ​ ដោយ​ប្រើប្រាស់​ទិន្នន័យ​ចល័ត…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"មិន​អាច​ប្ដូរ​ទៅ​បណ្ដាញ Wi-Fi បាន​ទេ"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ការហៅ​តាម​វីដេអូ​នឹង​នៅតែ​មាន​នៅ​លើ​បណ្ដាញ​ទូរសព្ទ។ អាច​នឹង​គិតថ្លៃ​ទិន្នន័យ​តាម​តម្លៃ​ស្តង់ដារ។"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"កុំ​បង្ហាញ​វា​ម្ដង​ទៀត"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-kn/strings.xml b/java/com/android/incallui/res/values-kn/strings.xml
index 5d47c7e..cb47e35 100644
--- a/java/com/android/incallui/res/values-kn/strings.xml
+++ b/java/com/android/incallui/res/values-kn/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ಅವರಿಂದ ಮಿಸ್ಡ್ ಕಾಲ್"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕೆಲಸದ ಕರೆ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೈ-ಫೈ ಕರೆ"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೈ-ಫೈ ಕೆಲಸದ ಕರೆ"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೈ-ಫೈ ಕರೆ"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೈ-ಫೈ ಕೆಲಸದ ಕರೆ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ಒಳಬರುವ ಕರೆ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ಫೋಟೋದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ಪೋಟೋ, ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ಲಗತ್ತುಗಳೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ಒಳಬರುವ ಕೆಲಸದ ಕರೆ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ಒಳಬರುವ ವೈ-ಫೈ ಕರೆ"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ಒಳಬರುವ ವೈ-ಫೈ ಕೆಲಸದ ಕರೆ"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"ಒಳಬರುವ ವೈ-ಫೈ ಕರೆ"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"ಒಳಬರುವ ವೈ-ಫೈ ಕೆಲಸದ ಕರೆ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ಒಳಬರುವ ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ಒಳಬರುವ ವೀಡಿಯೊ ವಿನಂತಿ"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"ಯಾವುದೇ ಸೇವೆಯಿಲ್ಲ"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"ವೀಡಿಯೊ ಕರೆ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"ಕರೆ ಮಾಡಲು, ಮೊದಲು ಏರ್‌ಪ್ಲೇನ್‌‌ ಮೋಡ್‌‌ ಆಫ್‌ ಮಾಡಿ."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ಇನ್ನೂ ನೋಂದಣಿಯಾಗಿಲ್ಲ."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ ಲಭ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಲಭ್ಯವಿಲ್ಲ."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ಕರೆಯನ್ನು ಮಾಡಲು, ಮಾನ್ಯವಾದ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI ಅನುಕ್ರಮ ಪ್ರಾರಂಭವಾಗುತ್ತಿದೆ…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ಕರೆಯಲ್ಲಿ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ ಬಳಸಿಕೊಂಡು ಕರೆ ಮುಂದುವರಿಸಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"ವೈ-ಫೈ ನೆಟ್‍ವರ್ಕ್‌ಗೆ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ವೀಡಿಯೊ ಕರೆ ಹಾಗೆಯೇ ಉಳಿಯುತ್ತದೆ. ಪ್ರಮಾಣಿತ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯಿಸಬಹುದು."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ಮೊಬೈಲ್ ಡೇಟಾ ಬಳಸಿಕೊಂಡು ಕರೆ ಮುಂದುವರಿಸಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ವೈ-ಫೈ ನೆಟ್‍ವರ್ಕ್‌ಗೆ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ವೀಡಿಯೊ ಕರೆ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ಹಾಗೆಯೇ ಉಳಿಯುತ್ತದೆ. ಪ್ರಮಾಣಿತ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯಿಸಬಹುದು."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ಮತ್ತೆ ಇದನ್ನು ತೋರಿಸಬೇಡ"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ko/strings.xml b/java/com/android/incallui/res/values-ko/strings.xml
index 44c5338..676ba08 100644
--- a/java/com/android/incallui/res/values-ko/strings.xml
+++ b/java/com/android/incallui/res/values-ko/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>의 부재중 전화"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"현재 통화"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"발신 업무 전화"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi 발신 전화"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"발신 Wi-Fi 업무 전화"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"진행 중인 Wi-Fi 통화"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"진행 중인 Wi-Fi 업무 통화"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"대기 중"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"수신전화"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"사진이 있는 수신 전화"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"사진, 메시지, 위치가 있는 중요한 수신 전화"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"첨부파일이 있는 중요한 수신 전화"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"수신 업무 전화"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi 수신 전화"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"수신 Wi-Fi 업무 전화"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"수신 Wi-Fi 통화"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"수신 Wi-Fi 업무 통화"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"의심스러운 스팸 발신자로부터 온 전화"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"수신 동영상 요청"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"서비스 불가"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"화상 통화 받기"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"전화를 걸려면 먼저 비행기 모드를 해제하세요."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"네트워크에서 등록되지 않았습니다."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"사용 가능한 이동통신망이 없습니다."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"모바일 네트워크를 사용할 수 없습니다."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"전화를 걸려면 올바른 번호를 입력하세요."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"전화를 걸 수 없습니다."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI 시퀀스 시작 중..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"통화 종료"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"다자간 통화"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"통화 중"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"모바일 데이터를 사용하여 계속 통화 중…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi 네트워크로 전환할 수 없습니다."</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"화상 통화가 모바일 네트워크에서 유지됩니다. 표준 데이터 요금이 부과될 수 있습니다."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"모바일 데이터를 사용하여 통화를 계속합니다…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi 네트워크로 전환할 수 없습니다."</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"화상 통화가 모바일 네트워크에서 계속됩니다. 표준 데이터 요금이 부과될 수 있습니다."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"다시 표시하지 않음"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ky/strings.xml b/java/com/android/incallui/res/values-ky/strings.xml
index 0f8ee3c..1f60604 100644
--- a/java/com/android/incallui/res/values-ky/strings.xml
+++ b/java/com/android/incallui/res/values-ky/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> дегенден кабыл алынбаган чалуу"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Учурдагы чалуу"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Учурда болуп жаткан чалуу (жумуш боюнча)"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Аткаруудагы Wi-Fi чалуу"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Учурда болуп жаткан Wi-Fi чалуу (жумуш боюнча)"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Учурдагы Wi-Fi чалуу"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Учурдагы Wi-Fi чалуу (жумуш боюнча)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Күтүлүүдө"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Кирүүчү чалуу"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Сүрөтү бар кирүүчү чалуу"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Сүрөт, билдирүү жана жайгашкан жер бар маанилүү чалуу"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Тиркемелери бар маанилүү кирүүчү чалуу"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Жумуш боюнча келип жаткан чалуу"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Кирүүчү Wi-Fi чалуу"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Жумуш боюнча келип жаткан Wi-Fi чалуу"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Келип жаткан Wi-Fi чалуу"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Жумуш боюнча келип жаткан Wi-Fi чалуу"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Келип жаткан чалуу спам окшойт"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Келип жаткан видео сурамы"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Байланыш жок"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Видео чалууну кабыл алуу"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Чалуу үчүн, адегенде учак режимин өчүрүңүз."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Тармакта катталган эмес."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Мобилдик тармак жеткиликтүү эмес."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Мобилдик тармак жок."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Чалуу үчүн, жарактуу номер киргизиңиз."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Чалынбай жатат."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI кезеги башталууда…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Чалууну бүтүрүү"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конференц-чалуу"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Чалууда"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Уюлдук дайындарды пайдалануу менен чалууну улантууда..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi тармагына туташа албай койдук"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видео чалуу уюлдук тармак аркылуу аткарылат. Стандарттык тариф боюнча акы алынышы мүмкүн."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Мобилдик дайындарды пайдалануу менен чалууну улантууда…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi тармагына туташа албай койдук"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видео чалуу мобилдик тармак аркылуу аткарылат. Стандарттык тариф боюнча акы алынышы мүмкүн."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Экинчи көрсөтүлбөсүн"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-lo/strings.xml b/java/com/android/incallui/res/values-lo/strings.xml
index 56335d4..45a2a40 100644
--- a/java/com/android/incallui/res/values-lo/strings.xml
+++ b/java/com/android/incallui/res/values-lo/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"ສາຍບໍ່ໄດ້ຮັບຈາກ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"ສາຍທີ່ກຳລັງໂທອອກ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ສາຍໂທອອກຈາກບ່ອນເຮັດວຽກ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ການ​ໂທ Wi​-Fi ທີ່ດໍາເນີນຢູ່"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ສາຍໂທອອກ Wi-Fi ຈາກບ່ອນເຮັດວຽກ"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"ການໂທ Wi-Fi ທີ່ດໍາເນີນຢູ່"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"ການໂທ Wi-Fi ບ່ອນເຮັດວຽກທີ່ດໍາເນີນຢູ່"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ພັກສາຍຊົ່ວຄາວ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ສາຍໂທເຂົ້າ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ສາຍໂທເຂົ້າພ້ອມຮູບພາບ"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ, ຂໍ້ຄວາມ ແລະ ສະຖານທີ່"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມໄຟລ໌ແນບ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ສາຍໂທເຂົ້າຈາກບ່ອນເຮັດວຽກ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ສາຍໂທເຂົ້າ Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ສາຍໂທເຂົ້າ Wi-Fi ຈາກບ່ອນເຮັດວຽກ"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"ສາຍໂທເຂົ້າ Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"ສາຍໂທເຂົ້າ Wi-Fi ບ່ອນເຮັດວຽກ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ມີການໂທທີ່ຄາດວ່າເປັນສະແປມໂທເຂົ້າມາ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"​ຄຳ​ຮ້ອງ​ຂໍ​ວິ​ດີ​ໂອ​ເຂົ້າ​ມາ"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"ບໍ່ມີບໍລິການ"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"ຮັບສາຍວິດີໂອ"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"ເພື່ອໂທລະສັບ, ໃຫ້ປິດໂໝດຢູ່ເທິງຍົນກ່ອນ."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"ບໍ່ໄດ້ລົງທະບຽນໃນເຄືອຂ່າຍ."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"ບໍ່​ມີ​ເຄືອ​ຂ່າຍ​ມື​ຖື​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"ເຄືອຂ່າຍມືຖືບໍ່ສາມາດໃຊ້ໄດ້."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ເພື່ອ​ທີ່​ຈະ​ໂທ, ປ້ອນ​ເບີ​ໂທ​ທີ່​ໃຊ້​ໄດ້​ເຂົ້າ​ໄປ."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"ບໍ່​ສາ​ມາດ​ໂທ​ໄດ້."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"ກຳລັງເລີ່ມຕົ້ນລຳດັບ MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ວາງສາຍ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"ການປະຊຸມທາງໂທລະສັບ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ຢູ່ໃນສາຍ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ສືບຕໍ່ການໂທໂດຍໃຊ້ອິນເຕີເນັດມືຖື…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"ບໍ່ສາມາດສະຫຼັບໄປໃຊ້ເຄືອຂ່າຍ Wi-Fi ໄດ້"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ການໂທດ້ວຍວິດີໂອຈະຍັງໃຊ້ຜ່ານເຄືອຂ່າຍມືຖືຢູ່ ໂດຍອາດມີການຮຽກເກັບຄ່າບໍລິການຕາມປົກກະຕິ."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ກຳລັງສືບຕໍ່ສາຍໂດຍໃຊ້ອິນເຕີເນັດມືຖື…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ບໍ່ສາມາດສະຫຼັບໄປໃຊ້ເຄືອຂ່າຍ Wi-Fi ໄດ້"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ການໂທວິດີໂອຈະຍັງຄົງຢູ່ໃນເຄືອຂ່າຍມືຖືຕໍ່ໄປ. ອາດມີການຮຽກເກັບຄ່າບໍລິການມາດຕະຖານ."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ບໍ່ຕ້ອງສະແດງຂໍ້ຄວາມນີ້ອີກ"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-lt/strings.xml b/java/com/android/incallui/res/values-lt/strings.xml
index 4d4a0c0..e63ca70 100644
--- a/java/com/android/incallui/res/values-lt/strings.xml
+++ b/java/com/android/incallui/res/values-lt/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Praleistas skambutis nuo <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Vykstantis pokalbis"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Vykstantis darbo skambutis"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Vykstantis „Wi-Fi“ skambutis"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Vykstantis „Wi-Fi“ darbo skambutis"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Vykstantis „Wi-Fi“ skambutis"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Vykstantis „Wi-Fi“ darbo skambutis"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Sulaikyta"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Gaunamasis skambutis"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Gaunamasis skambutis su nuotrauka"</string>
@@ -55,15 +55,15 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Svarbus gaunam. skamb. su nuotr., praneš. ir viet."</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Svarbus gaunamasis skambutis su priedais"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Gaunamasis darbo skambutis"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Gaunamasis „Wi-Fi“ skambutis"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Gaunamasis „Wi-Fi“ darbo skambutis"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Gaunamasis „Wi-Fi“ skambutis"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Gaunamasis „Wi-Fi“ darbo skambutis"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Gaunamasis įtartinas šlamšto skambutis"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Gaunama vaizdo skambučio užklausa"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Nėra paslaugos"</string>
     <string name="notification_network_selection_text" msgid="7190860774239009625">"Pasirinktas tinklas (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) negalimas"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Atsakyti"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Padėti ragelį"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vaizdo skambutis"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vaizdo skam."</string>
     <string name="notification_action_answer_voice" msgid="6237890905749760509">"Balsas"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Atsiliepti"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Atmesti"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Atlikti vaizdo skambutį"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Jei norite skambinti, išjunkite lėktuvo režimą."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Neregistruota tinkle."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Korinis tinklas nepasiekiamas"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobiliojo ryšio tinklas nepasiekiamas."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Kad galėtumėte paskambinti, įveskite tinkamą numerį."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Nepavyko paskambinti."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Paleidžiama MMI seka..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Baigti skambutį"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferencinis skambutis"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Skambinant"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Skambutis tęsiamas naudojant mobiliojo ryšio duomenis…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nepavyko prisijungti prie „Wi-Fi“ tinklo"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Vaizdo skambutis ir toliau bus vykdomas naudojant mobiliojo ryšio tinklą. Gali būti taikomi įprasti duomenų mokesčiai."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Skambutis tęsiamas naudojant mobiliojo ryšio duomenis…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nepavyko prisijungti prie „Wi-Fi“ tinklo"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Vaizdo skambutis ir toliau bus vykdomas naudojant mobiliojo ryšio tinklą. Gali būti taikomi įprasti duomenų mokesčiai."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Daugiau to nerodyti"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-lv/strings.xml b/java/com/android/incallui/res/values-lv/strings.xml
index 9be46c4..441733a 100644
--- a/java/com/android/incallui/res/values-lv/strings.xml
+++ b/java/com/android/incallui/res/values-lv/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Neatbildēts zvans no: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Pašreizējā saruna"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Notiekošs darba zvans"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Notiekošs Wi-Fi zvans"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Notiekošs darba Wi-Fi zvans"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Notiekošs Wi-Fi zvans"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Notiekošs darba Wi-Fi zvans"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Aizturēts"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Ienākošais zvans"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Ienākošais zvans ar fotoattēlu"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Zvans ar fotoattēlu, ziņojumu un atrašanās vietu"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Svarīgs ienākošais zvans ar pielikumiem"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ienākošs darba zvans"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Ienākošs Wi-Fi zvans"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Ienākošs darba Wi-Fi zvans"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Ienākošs Wi-Fi zvans"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Ienākošs darba Wi-Fi zvans"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Ienākošs, iespējams, nevēlams zvans"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Ienākošs video pieprasījums"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Nav pakalpojuma"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Pārsūtīt videozvanu"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Lai veiktu zvanu, vispirms izslēdziet lidojuma režīmu."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Tīklā nav reģistrēts."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilais tīkls nav pieejams."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilais tīkls nav pieejams."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Lai veiktu zvanu, ievadiet derīgu numuru."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Nevar veikt zvanu."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Notiek MMI secības startēšana…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Beigt zvanu"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferences zvans"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Notiek zvans"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Zvans tiek turpināts, izmantojot mobilos datus…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nevarēja pārslēgt uz Wi-Fi tīklu"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videozvans tiks turpināts mobilo sakaru tīklā. Var tikt piemērota standarta maksa par datu pārraidi."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Zvans tiek turpināts, izmantojot mobilos datus…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nevarēja pārslēgt uz Wi-Fi tīklu"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videozvans tiks turpināts mobilo sakaru tīklā. Var tikt piemērota standarta maksa par datu pārraidi."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Vairs nerādīt šo ziņojumu"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml
deleted file mode 100644
index 2679653..0000000
--- a/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 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>
-  <!-- This is customization of wifi call notification only for DTAG of Germany. -->
-  <!-- The "label" of the in-call Notification for an ongoing call, which is being made over
-       Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_ongoing_call_wifi">Ongoing WLAN Call</string>
-  <!-- The "label" of the in-call Notification for an ongoing work call, which is being made
-       over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_ongoing_work_call_wifi">Ongoing WLAN work call</string>
-  <!-- The "label" of the in-call Notification for an incoming ringing call,
-       which is being made over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_incoming_call_wifi">Incoming WLAN Call</string>
-  <!-- The "label" of the in-call Notification for an incoming ringing work call,
-       which is being made over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_incoming_work_call_wifi">Incoming WLAN work call</string>
-</resources>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/values-mk/strings.xml b/java/com/android/incallui/res/values-mk/strings.xml
index 03be1d9..b712fe0 100644
--- a/java/com/android/incallui/res/values-mk/strings.xml
+++ b/java/com/android/incallui/res/values-mk/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Пропуштен повик од <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Тековен повик"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Тековен работен повик"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Појдовен повик преку Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Тековен работен повик преку Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Тековен повик преку Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Тековен работен повик преку Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"На чекање"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Дојдовен повик"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Дојдовен повик со фотографија"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важен дојдовен повик со фото., порака и локација"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важен дојдовен повик со прилози"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Дојдовен работен повик"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Дојдовен повик преку Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Дојдовен работен повик преку Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Дојдовен повик преку Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Дојдовен работен повик преку Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Дојдовниот повик може да е спам"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Дојдовно побарување за видео"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Нема услуга"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Прифатете видеоповик"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"За да воспоставите повик, прво исклучете режим на работа во авион."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Не е регистриран на мрежа."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Не е достапна мобилна мрежа."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Нема достапна мобилна мрежа."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"За да повикате, внесете важечки број."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Не може да повика."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Започнува MMI низа..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завршете го повикот"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конференциски повик"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Повик во тек"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Повикот ќе продолжи преку мобилен интернет…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Не можеше да се префрли на Wi-Fi-мрежа"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видеоповикот ќе остане на мобилната мрежа. Може да се наплати за интернет-сообраќај."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Повикот ќе продолжи преку мобилен интернет…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Не можеше да се префрли на Wi-Fi-мрежа"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видеоповикот ќе остане на мобилната мрежа. Може да се наплати за мобилен интернет."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Не го прикажувај ова повторно"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ml/strings.xml b/java/com/android/incallui/res/values-ml/strings.xml
index e207ccd..db9f560 100644
--- a/java/com/android/incallui/res/values-ml/strings.xml
+++ b/java/com/android/incallui/res/values-ml/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> എന്നതിൽ നിന്നുള്ള മിസ്‌ഡ് കോൾ"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"കോൾ സജീവമാണ്"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ഓൺഗോയിംഗ് ഔദ്യോഗിക കോൾ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ഓൺഗോയിംഗ് വൈഫൈ കോൾ"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ഓൺഗോയിംഗ് വൈഫൈ ഔദ്യോഗിക കോൾ"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"നിലവിലുള്ള വൈഫൈ കോൾ"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"നിലവിലുള്ള വൈഫൈ ഔദ്യോഗിക കോൾ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ഹോള്‍ഡിലാണ്"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ഇന്‍കമിംഗ് കോള്‍"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ഫോട്ടോ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ഫോട്ടോയും സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"അറ്റാച്ച്‌മെന്റുകൾ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ഇൻകമിംഗ് ഔദ്യോഗിക കോൾ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ഇൻകമിംഗ് വൈഫൈ കോൾ"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ഇൻകമിംഗ് വൈഫൈ ഔദ്യോഗിക കോൾ"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"ഇൻകമിംഗ് വൈഫൈ കോൾ"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"ഇൻകമിംഗ് വൈഫൈ ഔദ്യോഗിക കോൾ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"സംശയാസ്‌പദമായ ഇൻകമിംഗ് സ്‌പാം കോൾ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ഇൻകമിംഗ് വീഡിയോ അഭ്യർത്ഥന"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"സേവനമില്ല"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"വീഡിയോ കോൾ അറ്റൻഡ് ചെയ്യുക"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"ഒരു കോൾ വിളിക്കാൻ, ആദ്യം ഫ്ലൈറ്റ് മോഡ് ഓഫുചെയ്യുക."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"നെറ്റ്‌വർക്കിൽ രജിസ്റ്റർ ചെയ്‌തിട്ടില്ല."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"സെല്ലുലാർ നെറ്റ്‌വർക്ക് ലഭ്യമല്ല."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"മൊബൈൽ നെറ്റ്‌വർക്ക് ലഭ്യമല്ല."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ഒരു കോൾ ചെയ്യുന്നതിന്, സാധുതയുള്ള നമ്പർ നൽകുക."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"കോൾ ചെയ്യാനായില്ല."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI സീക്വൻസ് ആരംഭിക്കുന്നു…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"കോള്‍ അവസാനിപ്പിക്കൂ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"കോൺഫറൻസ് കോൾ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"കോളിലാണ്"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"സെല്ലുലാർ ഡാറ്റ ഉപയോഗിച്ച് കോൾ തുടരുന്നു…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi നെറ്റ്‌വർക്കിലേക്ക് മാറാനായില്ല"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"സെല്ലുലാർ നെറ്റ്‌വർക്കിൽത്തന്നെ വീഡിയോ കോൾ തുടരും. സാധാരണ ഡാറ്റ നിരക്കുകൾ ബാധകമാകാം."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"മൊബൈൽ ഡാറ്റ ഉപയോഗിച്ച് കോൾ തുടരുന്നു…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"വൈഫൈ നെറ്റ്‌വർക്കിലേക്ക് മാറാനായില്ല"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"മൊബൈൽ നെറ്റ്‌വർക്കിൽത്തന്നെ വീഡിയോ കോൾ തുടരും. സാധാരണ ഡാറ്റ നിരക്കുകൾ ബാധകമാകാം."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ഇത് വീണ്ടും കാണിക്കരുത്"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-mn/strings.xml b/java/com/android/incallui/res/values-mn/strings.xml
index 0e26917..7757af9 100644
--- a/java/com/android/incallui/res/values-mn/strings.xml
+++ b/java/com/android/incallui/res/values-mn/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-н аваагүй дуудлага"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Хийгдэж буй дуудлага"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Залгаж буй албаны дуудлага"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ярьж буй Wi-Fi дуудлага"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Залгаж буй Wi-Fi албаны дуудлага"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Холбогдсон Wi-Fi дуудлага"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Холбогдсон Wi-Fi албаны дуудлага"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Хүлээлгэнд"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Ирж буй дуудлага"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Зураг бүхий орж ирсэн дуудлага"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Зураг, зурвас, байршилтай орж ирсэн чухал дуудлага"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Хавсралт бүхий орж ирсэн чухал дуудлага"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ирж буй албаны дуудлага"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Орж ирсэн Wi-Fi дуудлага"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Ирж буй Wi-Fi албаны дуудлага"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Ирж буй Wi-Fi дуудлага"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Ирж буй Wi-Fi албаны дуудлага"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Орж ирсэн сэжигтэй спам дуудлага"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Ирж буй видео хүсэлт"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Үйлчилгээ байхгүй"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Видео дуудлага авах"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Дуудлага хийхийн тулд юуны өмнө Нислэгийн төлвийг идэвхгүйжүүлнэ үү."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Сүлжээнд бүртгэгдээгүй."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Үүрэн сүлжээ байхгүй."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Мобайл сүлжээ байхгүй."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Дуудлага хийхийн тулд хүчин төгөлдөр дугаар оруулна уу."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Дуудлага хийх боломжгүй байна."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI дарааллыг эхлүүлж байна…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Дуудлагыг таслах"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Хурлын дуудлага"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Ярьж байна"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Үүрэн дата ашиглан дуудлагыг үргэлжлүүлж байна..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi сүлжээ рүү сэлгэж чадсангүй"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видео дуудлага үүрэн сүлжээнд үлдэнэ. Стандарт датаны төлбөр тооцогдож магадгүй."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Мобайл дата ашиглан дуудлагыг үргэлжлүүлж байна…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi сүлжээ рүү сэлгэж чадсангүй"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видео дуудлага мобайл сүлжээнд үлдэнэ. Стандарт датаны төлбөр тооцогдож магадгүй."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Үүнийг дахин бүү үзүүл"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-mr/strings.xml b/java/com/android/incallui/res/values-mr/strings.xml
index c56c610..e422897 100644
--- a/java/com/android/incallui/res/values-mr/strings.xml
+++ b/java/com/android/incallui/res/values-mr/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> कडील सुटलेला कॉल"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"सुरू असलेला कॉल"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"सुरु असलेला कार्य कॉल"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"सुरु असलेला वाय-फाय कॉल"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"सुरु असलेला वाय-फाय कार्य कॉल"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"सुरु असलेला वाय-फाय कॉल"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"सुरु असलेला वाय-फाय कार्य कॉल"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"होल्ड वर"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"येणारा कॉल"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"फोटोसह येणारा कॉल"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"फोटो, संदेश आणि स्थानासह महत्त्वाचा येणारा कॉल"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"संलग्नकांसह महत्त्वाचा येणारा कॉल"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"येणारा कार्य कॉल"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"येणारा वाय-फाय कॉल"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"येणारा वाय-फाय कार्य कॉल"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"येणारा वाय-फाय कॉल"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"येणारा वाय-फाय कार्य कॉल"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"येणारा संशयित स्पॅम कॉल"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"येणारी व्हिडिओ विनंती"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"सेवा नाही"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"व्हिडिओ कॉल घ्या"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"कॉल करण्यासाठी, प्रथम विमान मोड बंद करा."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"नेटवर्कवर नोंदणीकृत नाही."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"सेल्युलर नेटवर्क उपलब्ध नाही."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"मोबाइल नेटवर्क उपलब्ध नाही."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"कॉल करण्यासाठी, एक वैध नंबर प्रविष्ट करा."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"कॉल करू शकत नाही."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI क्रम प्रारंभ करीत आहे..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"कॉल समाप्त करा"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"परिषद कॉल"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"कॉल मध्ये"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"मोबाइल डेटा वापरून कॉल सुरू ठेवत आहेत…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"वाय-फाय नेटवर्कवर स्विच करणे शक्य झाले नाही"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"व्हिडिओ कॉल मोबाईल नेटवर्कवर असेल. मानक डेटा शुल्क लागू होऊ शकतात."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"मोबाइल डेटा वापरून कॉल करणे सुरु ठेवत आहे..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"वाय-फाय नेटवर्कवर स्विच करणे शक्य झाले नाही"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"व्हिडिओ कॉल मोबाइल नेटवर्कवर असेल. मानक डेटा शुल्क लागू शकतात."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"हे पुन्हा दर्शवू नका"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ms/strings.xml b/java/com/android/incallui/res/values-ms/strings.xml
index a5be593..7a5900a 100644
--- a/java/com/android/incallui/res/values-ms/strings.xml
+++ b/java/com/android/incallui/res/values-ms/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Panggilan tidak dijawab daripada <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Panggilan sedang berjalan"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Panggilan sedang berlangsung daripada tempat kerja"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Panggilan Wi-Fi sedang berlangsung"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Panggian Wi-Fi sedang berlangsung daripada tempat kerja"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Panggilan Wi-Fi sedang berlangsung"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Panggilan Wi-Fi daripada tempat kerja sedang berlangsung"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ditunda"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Panggilan masuk"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Panggilan masuk dengan foto"</string>
@@ -55,15 +55,15 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Panggilan masuk penting dengan foto, mesej dan lokasi"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Panggilan masuk penting dengan lampiran"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Panggilan masuk daripada tempat kerja"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Panggilan Wi-Fi masuk"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Panggilan masuk melalui Wi-Fi daripada tempat kerja"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Panggilan masuk Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Panggilan masuk Wi-Fi daripada tempat kerja"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Disyaki panggilan spam masuk"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Permintaan video masuk"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Tiada perkhidmatan"</string>
     <string name="notification_network_selection_text" msgid="7190860774239009625">"Rangkaian pilihan (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) tidak tersedia"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Jawapan"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Letakkan gagang"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video dalam strim"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_answer_voice" msgid="6237890905749760509">"Suara"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Terima"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Tolak"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Jawab Panggilan Video"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Untuk membuat panggilan, matikan mod Pesawat terlebih dahulu."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Tidak didaftarkan pada rangkaian."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rangkaian selular tidak tersedia."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Rangkaian mudah alih tidak tersedia."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Untuk membuat panggilan, masukkan nombor yang sah."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Tidak dapat memanggil."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Memulakan jujukan MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Tamatkan panggilan"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Panggilan sidang"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Dalam panggilan"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Meneruskan panggilan menggunakan data selular…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Tidak dapat beralih ke rangkaian Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Panggilan video akan menggunakan rangkaian selular. Caj data standard boleh dikenakan."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Meneruskan panggilan menggunakan data mudah alih…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Tidak dapat beralih ke rangkaian Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Panggilan video akan menggunakan rangkaian mudah alih. Caj data standard boleh dikenakan."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Jangan tunjukkan ini lagi"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-my/strings.xml b/java/com/android/incallui/res/values-my/strings.xml
index 5cca498..5513b79 100644
--- a/java/com/android/incallui/res/values-my/strings.xml
+++ b/java/com/android/incallui/res/values-my/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> မှလွတ်သွားသော ခေါ်ဆိုမှု"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"ဆက်သွားနေသော ဖုန်းခေါ်မှု"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ခေါ်နေဆဲ အလုပ်မှ ခေါ်ဆိုမှု"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ခေါ်နေဆဲ ဝိုင်ဖိုင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ခေါ်နေဆဲ Wi-Fi အလုပ်မှ ခေါ်ဆိုမှု"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"လက်ရှိ Wi-Fi ဖုန်းခေါ်ဆိုမှု"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"လက်ရှိ Wi-Fi အလုပ်ဖုန်းခေါ်ဆိုမှု"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ခဏ ကိုင်ထားစဉ်"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"အဝင်ခေါ်ဆိုမှု"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ဓာတ်ပုံဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ဓာတ်ပုံ၊မက်ဆေ့ဂျ်၊တည်နေရာဖြင့် အရေးကြီးခေါ်ဆိုမှု"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ပူးတွဲပါဖိုင်များဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"အဝင် ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ဝင်လာသော ဝိုင်ဖိုင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Wi-Fi အလုပ်မှ အဝင် ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"အဝင် Wi‑Fi ဖုန်းခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"အဝင် Wi‑Fi အလုပ်ဖုန်းခေါ်ဆိုမှု"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ခေါ်နေသော မသင်္ကာဖွယ်ရာ စပမ်းခေါ်ဆိုမှု"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"အသံ ခေါ်ဆိုမှုအဖြစ် တောင်းဆိုမှု"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"ဝန်ဆောင်မှု မရှိပါ"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"ဗီဒီယိုခေါ်ဆိုမှုလွှဲယူပါ"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"ဖုန်းခေါ်ဆိုမှုပြုရန်, လေယာဥ်ပျံပေါ်အသုံးပြုသောစနစ်ကို ပိတ်ပါ"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"ကွန်ယက်ပေါ်မှာ မှတ်ပုံတင်မှု မပြုလုပ်ထားပါ"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"ဆဲလ်လူလာ ကွန်ရက် မရှိပါ။"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"မိုဘိုင်းကွန်ရက် မရနိုင်ပါ"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ဖုန်းခေါ်ရန်အတွက်၊ သင့်လျော်သည့်နံပါတ် ရိုက်ထည့်ပါ။"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"မခေါ်ဆိုနိုင်ပါ။"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI အမှတ်စဉ်ကို စတင်နေပါသည်…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ခေါ်ဆိုမှုအပြီးသတ်ရန်"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"အစည်းအဝေးခေါ်ဆိုမှု"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ဖုန်းပြောနေသည်"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ဆယ်လူလာဒေတာသုံးပြီး ဆက်လက်ခေါ်ဆိုနေသည်…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi ကွန်ရက်သို့ မပြောင်းနိုင်ပါ"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ဗီဒီယိုခေါ်ဆိုမှုသည် ဆယ်လူလာကွန်ရက်တွင် ဆက်ရှိနေပါမည်။ ပုံမှန်ဒေတာသုံးစွဲခများ ကျသင့်နိုင်ပါသည်။"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"မိုဘိုင်းဒေတာသုံးပြီး ဆက်လက်ခေါ်ဆိုနေသည်…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi‑Fi ကွန်ရက်သို့ မပြောင်းနိုင်ပါ"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ဗီဒီယိုခေါ်ဆိုမှုသည် မိုဘိုင်းကွန်ရက်တွင် ဆက်ရှိနေပါမည်။ ပုံမှန်ဒေတာသုံးစွဲခများ ကျသင့်နိုင်ပါသည်။"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ဤသည်ကို ထပ်မပြပါနှင့်"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-nb/strings.xml b/java/com/android/incallui/res/values-nb/strings.xml
index d0883a2..4e8d796 100644
--- a/java/com/android/incallui/res/values-nb/strings.xml
+++ b/java/com/android/incallui/res/values-nb/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Tapt anrop fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Pågående samtale"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Pågående jobbanrop"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Pågående Wi-Fi-anrop"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Pågående jobbanrop via Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Pågående Wi-Fi-samtale"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Pågående jobbsamtale via Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Parkert"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Innkommende samtale"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Innkommende anrop med bilde"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktig anrop med bilde, melding og posisjon"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktig innkommende anrop med vedlegg"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Innkommende jobbanrop"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Innkommende anrop via Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Innkommende jobbanrop via Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Innkommende anrop via Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Innkommende jobbanrop via Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Innkommende anrop fra en mulig useriøs oppringer"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Innkommende videoforespørsel"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Ingen tjeneste"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Svar på videoanropet"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"For å ringe, slå av flymodus først."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ikke registrert på nettverket."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilnettverket er ikke tilgjengelig."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilnettverket er ikke tilgjengelig."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Skriv inn et gyldig nummer for å plassere en samtale."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan ikke ringe."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Begynner MMI-sekvens…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Avslutt samtalen"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonmøte"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Samtale pågår"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Fortsetter samtalen via mobildata …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Kan ikke bytte til Wi-Fi-nettverk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videosamtalen blir værende på mobilnettet. Standard datakostnader kan påløpe."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Fortsetter samtalen via mobildata …"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kunne ikke bytte til Wi-Fi-nettverk"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videosamtalen blir værende på mobilnettverket. Standard datakostnader kan påløpe."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ikke vis dette igjen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ne/strings.xml b/java/com/android/incallui/res/values-ne/strings.xml
index b589479..b19c2ae 100644
--- a/java/com/android/incallui/res/values-ne/strings.xml
+++ b/java/com/android/incallui/res/values-ne/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> बाट आएको छुटेको कल"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"चलिरहेको कल"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"चालू रहेको कार्यको कल"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"चालु रहेको WI-Fi कल"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"चालू रहेको Wi-Fi कार्यको कल"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"जारी रहेको WI-Fi कल"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Wi-Fi मार्फत जारी रहेको कार्यालयको कल"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"होल्डमा"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"आगमन कल"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"तस्बिरसहितको आगमन कल"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"तस्बिर, सन्देश र स्थानसहितको महत्त्वपूर्ण आगमन कल"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"समावेश गरिएको वस्तुसहितको महत्त्वपूर्ण आगमन कल"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"आगमन कार्यको कल"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"आगमन Wi-Fi कल"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"आगमन Wi-Fi कार्यको कल"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Wi-Fi मार्फत आगमन कल"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Wi-Fi मार्फत कार्यालयबाट आएको कल"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"शंकास्पद आगमन स्प्याम कल"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"आगमन भिडियो अनुरोध"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"सेवा छैन"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"भिडियो कल लिनुहोस्"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"कल राख्नका लागि, पहिले हवाइजहाज मोड बन्द गर्नुहोस्।"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"नेटवर्कमा दर्ता भएको छैन।"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"सेलुलर सञ्जाल उपलब्ध छैन।"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"मोबाइल नेटवर्क उपलब्ध छैन।"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"एक कल गर्नको लागि, एक वैध नम्बर प्रविष्ट गर्नुहोस्।"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"कल गर्न सक्दैन।"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI अनुक्रम सुरु गर्दै..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"कल अन्त्य गर्नुहोस्"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"सम्मेलन कल"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"कलमा"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"सेलुलर डेटा प्रयोग गरी कललाई निरन्तरता दिइँदै…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi नेटवर्कमा स्विच गर्न सकिएन"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"भिडियो कल सेलुलर नेटवर्कमा रहने छ। मानक डेटा शुल्क लाग्न सक्छ।"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"मोबाइल डेटा प्रयोग गरी कललाई निरन्तरता दिइँदै…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi नेटवर्कमा स्विच गर्न सकिएन"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"भिडियो कल मोबाइल नेटवर्कमा रहने छ। मानक डेटा शुल्क लाग्न सक्छ।"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"यसलाई फेरि नदेखाउनुहोस्"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-nl/strings.xml b/java/com/android/incallui/res/values-nl/strings.xml
index 930acdc..7350881 100644
--- a/java/com/android/incallui/res/values-nl/strings.xml
+++ b/java/com/android/incallui/res/values-nl/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Gemiste oproep van <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Actieve oproep"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Actieve zakelijke oproep"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Actieve wifi-oproep"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Actieve zakelijke oproep via wifi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Actieve wifi-oproep"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Actieve zakelijke oproep via wifi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"In de wacht"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Inkomende oproep"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkomende oproep met foto"</string>
@@ -55,15 +55,15 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Belangrijke oproep met foto, bericht en locatie"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Belangrijke inkomende oproep met bijlagen"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkomende zakelijke oproep"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Inkomende wifi-oproep"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Inkomende zakelijke oproep via wifi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Inkomende wifi-oproep"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Inkomende zakelijke oproep via wifi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Inkomende vermoedelijke spamoproep"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Binnenkomend videoverzoek"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Geen service"</string>
     <string name="notification_network_selection_text" msgid="7190860774239009625">"Geselecteerd netwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) niet beschikbaar"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Antwoord"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Ophangen"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"InStream-video"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_answer_voice" msgid="6237890905749760509">"Spraak"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accepteren"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Weigeren"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Videogesprek beantwoorden"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Als je wilt bellen, moet je eerst de Vliegtuigmodus uitschakelen."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Niet geregistreerd op netwerk."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobiel netwerk niet beschikbaar."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobiel netwerk niet beschikbaar."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Als je wilt bellen, moet je een geldig nummer invoeren."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan niet bellen."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI-reeks starten..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Oproep beëindigen"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonische vergadering"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"In gesprek"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Gesprek voortzetten via mobiele data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Overschakelen naar wifi-netwerk mislukt"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videogesprek loopt via mobiel netwerk. Er kunnen standaard datakosten in rekening worden gebracht."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Gesprek voortzetten via mobiele data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Overschakelen naar wifi-netwerk mislukt"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videogesprek loopt via mobiel netwerk. Er kunnen standaard datakosten in rekening worden gebracht."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Dit niet meer weergeven"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-no/strings.xml b/java/com/android/incallui/res/values-no/strings.xml
index d0883a2..4e8d796 100644
--- a/java/com/android/incallui/res/values-no/strings.xml
+++ b/java/com/android/incallui/res/values-no/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Tapt anrop fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Pågående samtale"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Pågående jobbanrop"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Pågående Wi-Fi-anrop"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Pågående jobbanrop via Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Pågående Wi-Fi-samtale"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Pågående jobbsamtale via Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Parkert"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Innkommende samtale"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Innkommende anrop med bilde"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktig anrop med bilde, melding og posisjon"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktig innkommende anrop med vedlegg"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Innkommende jobbanrop"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Innkommende anrop via Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Innkommende jobbanrop via Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Innkommende anrop via Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Innkommende jobbanrop via Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Innkommende anrop fra en mulig useriøs oppringer"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Innkommende videoforespørsel"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Ingen tjeneste"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Svar på videoanropet"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"For å ringe, slå av flymodus først."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ikke registrert på nettverket."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilnettverket er ikke tilgjengelig."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilnettverket er ikke tilgjengelig."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Skriv inn et gyldig nummer for å plassere en samtale."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan ikke ringe."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Begynner MMI-sekvens…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Avslutt samtalen"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonmøte"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Samtale pågår"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Fortsetter samtalen via mobildata …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Kan ikke bytte til Wi-Fi-nettverk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videosamtalen blir værende på mobilnettet. Standard datakostnader kan påløpe."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Fortsetter samtalen via mobildata …"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kunne ikke bytte til Wi-Fi-nettverk"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videosamtalen blir værende på mobilnettverket. Standard datakostnader kan påløpe."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ikke vis dette igjen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pa/strings.xml b/java/com/android/incallui/res/values-pa/strings.xml
index 22cd7da..b21cbd3 100644
--- a/java/com/android/incallui/res/values-pa/strings.xml
+++ b/java/com/android/incallui/res/values-pa/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ਤੋਂ ਖੁੰਝੀ ਹੋਈ ਕਾਲ"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"ਜਾਰੀ ਕਾਲ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ਕੰਮ ਸਬੰਧਿਤ ਜਾਰੀ ਕਾਲ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ਜਾਰੀ Wi-Fi ਕਾਲ"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ਕੰਮ ਸਬੰਧਿਤ ਜਾਰੀ Wi-Fi ਕਾਲ"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"ਜਾਰੀ Wi‑Fi ਕਾਲ"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"ਕੰਮ ਸਬੰਧੀ ਜਾਰੀ Wi‑Fi ਕਾਲ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ਹੋਲਡ ਤੇ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ਇਨਕਮਿੰਗ ਕਾਲ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ਫ਼ੋਟੋ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ਫ਼ੋਟੋ, ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ਅਟੈਚਮੈਂਟਾਂ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ਕੰਮ ਸਬੰਧਿਤ ਆ ਰਹੀ ਕਾਲ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ਇਨਕਮਿੰਗ Wi-Fi ਕਾਲ"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ਕੰਮ ਸਬੰਧਿਤ ਆ ਰਹੀ Wi-Fi ਕਾਲ"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"ਆ ਰਹੀ Wi‑Fi ਕਾਲ"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"ਕੰਮ ਸਬੰਧੀ ਆ ਰਹੀ Wi‑Fi ਕਾਲ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲ ਆ ਰਹੀ ਹੈ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਬੇਨਤੀ"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"ਕੋਈ ਸੇਵਾ ਨਹੀਂ"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"ਵੀਡੀਓ ਕਾਲ ਲਓ"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"ਇੱਕ ਕਾਲ ਕਰਨ ਲਈ, ਪਹਿਲਾਂ ਏਅਰਪਲੇਨ ਮੋਡ ਬੰਦ ਕਰੋ।"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"ਨੈਟਵਰਕ ਤੇ ਰਜਿਸਟਰ ਨਹੀਂ ਕੀਤਾ।"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"ਸੈਲਿਊਲਰ ਨੈਟਵਰਕ ਉਪਲਬਧ ਨਹੀਂ"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ਇੱਕ ਕਾਲ ਕਰਨ ਲਈ, ਇੱਕ ਪ੍ਰਮਾਣਿਕ ਨੰਬਰ ਦਰਜ ਕਰੋ।"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"ਕਾਲ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI ਕੜੀ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ਕਾਲ ਸਮਾਪਤ ਕਰੋ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"ਕਾਨਫਰੰਸ ਕਾਲ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ਕਾਲ ਵਿੱਚ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ਸੈਲਿਊਲਰ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਨਾਲ ਕਾਲ ਜਾਰੀ ਰੱਖੀ ਜਾ ਰਹੀ ਹੈ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi ਨੈੱਟਵਰਕ \'ਤੇ ਬਦਲੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ਵੀਡੀਓ ਕਾਲ ਸੈਲਿਊਲਰ ਨੈੱਟਵਰਕ \'ਤੇ ਰਹੇਗੀ। ਸਧਾਰਨ ਡੈਟਾ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ਮੋਬਾਈਲ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕਾਲ ਜਾਰੀ ਰੱਖੀ ਜਾ ਰਹੀ ਹੈ…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi‑Fi ਨੈੱਟਵਰਕ \'ਤੇ ਬਦਲੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ਵੀਡੀਓ ਕਾਲ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ \'ਤੇ ਜਾਰੀ ਰਹੇਗੀ। ਮਿਆਰੀ ਡੈਟਾ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ਇਸ ਨੂੰ ਦੁਬਾਰਾ ਨਾ ਵਿਖਾਓ"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pl/strings.xml b/java/com/android/incallui/res/values-pl/strings.xml
index 77c8339..451c8ba 100644
--- a/java/com/android/incallui/res/values-pl/strings.xml
+++ b/java/com/android/incallui/res/values-pl/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Nieodebrane połączenie od: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Trwa połączenie"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Trwa połączenie służbowe"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Trwające połączenie przez Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Trwa połączenie służbowe przez Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Trwające połączenie przez Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Trwa połączenie służbowe przez Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Oczekujące"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Połączenie"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Połączenie przychodzące ze zdjęciem"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Ważne połączenie przychodzące z załącznikami"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ważne połączenie przychodzące z załącznikami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Przychodzące połączenie służbowe"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Przychodzące połączenie przez Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Przychodzące połączenie służbowe przez Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Przychodzące połączenie przez Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Przychodzące połączenie służbowe przez Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Przychodzące połączenie podejrzanie o spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Przychodzące żądanie wideo"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Brak usługi"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Odbierz rozmowę wideo"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Aby rozpocząć połączenie, wyłącz najpierw tryb samolotowy"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nie zarejestrowano w sieci"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Sieć komórkowa jest niedostępna."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Sieć komórkowa jest niedostępna."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Aby zadzwonić, wybierz prawidłowy numer."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Nie można dzwonić."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Rozpoczynanie sekwencji MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Zakończ połączenie"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Połączenie konferencyjne"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"W trakcie rozmowy"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Kontynuuję rozmowę przy użyciu transmisji danych komórkowych…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nie udało się przełączyć na sieć Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Rozmowa wideo pozostanie w sieci komórkowej. Za transfer danych może zostać pobrana opłata."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Kontynuuję rozmowę przy użyciu mobilnej transmisji danych…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nie udało się przełączyć na sieć Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Rozmowa wideo będzie nadal prowadzona przez sieć komórkową. Za transfer danych może zostać pobrana opłata."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Nie pokazuj ponownie tego komunikatu"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pt-rBR/strings.xml b/java/com/android/incallui/res/values-pt-rBR/strings.xml
index b0e46df..f3c1b23 100644
--- a/java/com/android/incallui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/res/values-pt-rBR/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Chamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada em andamento"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de trabalho em andamento"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chamada Wi-Fi em andamento"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada trabalho por Wi-Fi em andamento"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Chamada por Wi-Fi em andamento"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Chamada de trabalho por Wi-Fi em andamento"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada recebida importante com foto, mensagem e local"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada Wi-Fi recebida"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada de trabalho recebida por Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Chamada recebida por Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Chamada de trabalho recebida por Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chamada recebida suspeita (spam)"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Recebendo solicitação de vídeo"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Sem serviço"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Atender à videochamada"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Para fazer uma chamada, primeiro desative o modo avião."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Não registrado na rede."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rede celular não disponível."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Rede móvel indisponível."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para realizar uma chamada, digite um número válido."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Não é possível realizar chamadas."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iniciando sequência MMI…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Encerrar chamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Teleconferência"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Em chamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuando a chamada com dados da rede celular…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Não foi possível alternar para a rede Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"A videochamada continuará via rede celular. Sujeito a cobranças por uso de dados."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando chamada por dados móveis…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Não foi possível alternar para a rede Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videochamada continuará via rede móvel. O uso de dados está sujeito a cobranças padrão."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Não exibir novamente"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pt-rPT/strings.xml b/java/com/android/incallui/res/values-pt-rPT/strings.xml
index b42b0e5..1040432 100644
--- a/java/com/android/incallui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/res/values-pt-rPT/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Chamada não atendida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada em curso"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de trabalho em curso"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chamada Wi-Fi em curso"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada de trabalho por Wi-Fi em curso"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Chamada por Wi-Fi em curso"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Chamada de trabalho por Wi-Fi em curso"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"."</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada Wi-Fi recebida"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada de trabalho recebida por Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Chamada por Wi-Fi recebida"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Chamada de trabalho por Wi-Fi recebida"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"A receber chamada spam suspeita"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Pedido de vídeo recebido"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Nenhum serviço"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Aceitar videochamada"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Para efectuar uma chamada, desactive primeiro o modo para Avião."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Sem registo na rede."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rede móvel não disponível."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Rede móvel não disponível."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para telefonar, introduza um número válido."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Não é possível telefonar."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"A iniciar sequência de MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Terminar chamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Chamada de conferência"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Numa chamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"A continuar a chamada com dados móveis…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Não foi possível mudar para a rede Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"As videochamadas continuarão a ser efetuadas através de rede móvel. Poderão ser aplicados custos de dados."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"A continuar a chamada com dados móveis…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Não foi possível mudar para a rede Wi-Fi."</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"As videochamadas irão continuar a ser efetuadas através da rede móvel. Poderão ser aplicados custos de dados padrão."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Não voltar a mostrar este aviso"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pt/strings.xml b/java/com/android/incallui/res/values-pt/strings.xml
index b0e46df..f3c1b23 100644
--- a/java/com/android/incallui/res/values-pt/strings.xml
+++ b/java/com/android/incallui/res/values-pt/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Chamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada em andamento"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de trabalho em andamento"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chamada Wi-Fi em andamento"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada trabalho por Wi-Fi em andamento"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Chamada por Wi-Fi em andamento"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Chamada de trabalho por Wi-Fi em andamento"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada recebida importante com foto, mensagem e local"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada Wi-Fi recebida"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada de trabalho recebida por Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Chamada recebida por Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Chamada de trabalho recebida por Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chamada recebida suspeita (spam)"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Recebendo solicitação de vídeo"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Sem serviço"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Atender à videochamada"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Para fazer uma chamada, primeiro desative o modo avião."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Não registrado na rede."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rede celular não disponível."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Rede móvel indisponível."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para realizar uma chamada, digite um número válido."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Não é possível realizar chamadas."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iniciando sequência MMI…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Encerrar chamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Teleconferência"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Em chamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuando a chamada com dados da rede celular…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Não foi possível alternar para a rede Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"A videochamada continuará via rede celular. Sujeito a cobranças por uso de dados."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando chamada por dados móveis…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Não foi possível alternar para a rede Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videochamada continuará via rede móvel. O uso de dados está sujeito a cobranças padrão."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Não exibir novamente"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ro/strings.xml b/java/com/android/incallui/res/values-ro/strings.xml
index db8be10..b78be2e 100644
--- a/java/com/android/incallui/res/values-ro/strings.xml
+++ b/java/com/android/incallui/res/values-ro/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Apel nepreluat de la <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Apel în desfășurare"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Apel de serviciu în desfășurare"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Apel Wi-Fi în desfășurare"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Apel de serviciu prin Wi-Fi în desfășurare"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Apel Wi-Fi în desfășurare"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Apel de serviciu prin Wi-Fi în desfășurare"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"În așteptare"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Apel de intrare"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Apel primit cu fotografie"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Apel primit important cu poză, mesaj și locație"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Apel primit important cu atașamente"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Apel de serviciu primit"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Apel prin Wi-Fi primit"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Apel de serviciu prin Wi-Fi primit"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Apel primit prin Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Apel de serviciu primit prin Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Un apel primit posibil spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitare de trecere la apel video"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Fără serviciu"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Preluați apelul video"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Pentru a efectua un apel, mai întâi dezactivați modul Avion."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Neînregistrat în rețea."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rețeaua mobilă nu este disponibilă"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Rețeaua mobilă nu este disponibilă."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Pentru a apela, introduceți un număr valid."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Nu se poate apela."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Se pornește secvența MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Încheiați apelul"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Teleconferință"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Apel în desfășurare"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Se continuă apelul folosind datele mobile…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nu s-a putut comuta la rețeaua Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Apelul video rămâne în rețeaua mobilă. Se pot aplica tarife standard pentru date."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Se continuă apelul folosind datele mobile…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nu s-a putut comuta la rețeaua Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Apelul video continuă prin rețeaua mobilă. Se pot aplica tarife standard pentru date."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Nu mai afișa acest mesaj"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ru/strings.xml b/java/com/android/incallui/res/values-ru/strings.xml
index 8fd924e..06276c6 100644
--- a/java/com/android/incallui/res/values-ru/strings.xml
+++ b/java/com/android/incallui/res/values-ru/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Пропущенные вызовы от абонента <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Текущий вызов"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Текущий звонок (работа)"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Текущий Wi-Fi-звонок"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Текущий Wi-Fi-звонок (работа)"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Текущий вызов по Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Текущий вызов по Wi-Fi (работа)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ждет ответа"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Входящий вызов"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Входящий вызов с фотографией"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важный вызов с фото, сообщением и геоданными"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важный входящий вызов с прикрепленными файлами"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Входящий звонок (работа)"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Входящий Wi-Fi-звонок"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Входящий Wi-Fi-звонок (работа)"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Входящий вызов по Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Входящий вызов по Wi-Fi (работа)"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Входящий вызов: подозрение на спам"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Входящий видеовызов"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Сеть не найдена"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Продолжить на этом устройстве"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Перед тем как звонить, отключите режим полета."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Нет регистрации в сети."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Мобильная сеть недоступна."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Мобильная сеть недоступна."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Недействительный номер."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Не удалось позвонить."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Запуск последовательности MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завершить вызов"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конференц-вызов"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Вызов"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Переключение на мобильные данные…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Не удалось подключиться к сети Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видеовызов будет выполняться по мобильной сети. Может взиматься стандартная плата за передачу данных."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Переключение на мобильный Интернет…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Не удалось переключиться на сеть Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видеовызов будет выполняться по мобильной сети. Может взиматься стандартная плата за передачу данных."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Больше не показывать"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-si/strings.xml b/java/com/android/incallui/res/values-si/strings.xml
index 989879a..0497b78 100644
--- a/java/com/android/incallui/res/values-si/strings.xml
+++ b/java/com/android/incallui/res/values-si/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> වෙතින් මඟ හැරුණු ඇමතුම"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"කරගෙනය යන ඇමතුම"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"කරගෙන යන කාර්යාල ඇමතුම"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"දැනට ක්‍රියාත්මක Wi-Fi ඇමතුම"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"කරගෙන යන Wi-Fi කාර්යාල ඇමතුම"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"කරගෙන යන Wi-Fi ඇමතුම"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"කරගෙන යන Wi-Fi කාර්යාල ඇමතුම"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"රඳවා ගනිමින්"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"එන ඇමතුම"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ඡායාරූපය සමග එන ඇමතුම"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ඡායාරූපය, පණිවිඩය සහ ස්ථානය සමග වැදගත් එන ඇමතුම"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ඇමුණුම් සමග වැදගත් එන ඇමතුම"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"පැමිණෙන කාර්යාල ඇමතුම"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"පැමිණෙන Wi-Fi ඇමතුම"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"පැමිණෙන Wi-Fi කාර්යාල ඇමතුම"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"එන Wi-Fi ඇමතුම"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"එන Wi-Fi කාර්යාල ඇමතුම"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"එන සැකසහිත අයාචිත තැපැල් ඇමතුම"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"පැමිණෙන වීඩියෝ ඉල්ලීම"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"සේවාව නැත"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"වීඩියෝ ඇමතුම ගන්න"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"ඇමතුමක් ගැනීමට, මුලින්ම ගුවන්යානා ආකාරය අක්‍රිය කරන්න."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"ජාලය මත ලියාපදිංචි වී නැත."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"සෙලියුලර් ජාලය නොමැත"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"ජංගම ජාලය නොමැත."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ඇමතුමක් ලබාගැනීමට, වලංගු අංකයක් ලබාගන්න."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"ඇමතුම් ගැනීමට නොහැක."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI අනුපිළිවෙල ආරම්භ කරමින්…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ඇමතුම අවසන් කරන්න"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"සම්මන්ත්‍රණ ඇමතුම"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ඇමතුමක"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"සෙලියුලර් දත්ත භාවිතයෙන් ඇමතුම දිගටම කරගෙන යමින්…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi ජාලය වෙත මාරු කිරීමට නොහැකි විය"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"වීඩියෝ ඇමතුම සෙලියුලර් ජාලයේ පවතිනු ඇත. සම්මත දත්ත ගාස්තු අදාළ විය හැකිය."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ජංගම දත්ත භාවිතයෙන් ඇමතුම දිගටම කරගෙන යමින්…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi ජාලය වෙත මාරු කිරීමට නොහැකි විය"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"වීඩියෝ ඇමතුම ජංගම ජාලයේ පවතිනු ඇත. සම්මත දත්ත ගාස්තු අදාළ විය හැකිය."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"නැවත මෙය නොපෙන්වන්න"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sk/strings.xml b/java/com/android/incallui/res/values-sk/strings.xml
index d09ba44..b83cd94 100644
--- a/java/com/android/incallui/res/values-sk/strings.xml
+++ b/java/com/android/incallui/res/values-sk/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Zmeškaný hovor od volajúceho <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Prebiehajúci hovor"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Prebiehajúci pracovný hovor"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Odchádzajúci hovor prostredníctvom siete Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Prebiehajúci pracovný hovor cez Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Prebiehajúci hovor cez Wi‑Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Prebiehajúci pracovný hovor cez Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Podržaný hovor"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Prichádzajúci hovor"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Prichádzajúci hovor s fotkou"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Dôležitý prich. hovor s fotkou, správou a polohou"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Dôležitý prichádzajúci hovor s prílohami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Prichádzajúci pracovný hovor"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Prichádzajúci hovor prostredníctvom siete Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Prichádzajúci pracovný hovor cez Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Prichádzajúci hovor cez Wi‑Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Prichádzajúci pracovný hovor cez Wi‑Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Prichádzajúci hovor, pri ktorom je podozrenie, že ide o spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Prichádzajúca žiadosť o video"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Žiadny signál"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Prevziať videohovor"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Ak chcete telefonovať, vypnite najprv režim v lietadle."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Prihlásenie do siete nebolo úspešné."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilná sieť nie je k dispozícii."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilná sieť nie je k dispozícii."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Ak chcete volať, zadajte platné číslo"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Hovor nie je možné uskutočniť"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Prebieha spúšťanie sekvencie MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ukončiť hovor"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferenčný hovor"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Prebieha hovor"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Pokračuje sa v hovore pomocou mobilných dát…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nepodarilo sa prepnúť na sieť Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videohovor bude pokračovať v mobilnej sieti. Môžu sa účtovať štandardné poplatky za prenos dát."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Pokračuje sa v hovore pomocou mobilných dát…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nepodarilo sa prepnúť na sieť Wi‑Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videohovor bude pokračovať v mobilnej sieti. Môžu sa účtovať štandardné poplatky za prenos dát."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Informácie nabudúce nezobrazovať"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sl/strings.xml b/java/com/android/incallui/res/values-sl/strings.xml
index b083e1b..cf51ff5 100644
--- a/java/com/android/incallui/res/values-sl/strings.xml
+++ b/java/com/android/incallui/res/values-sl/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Neodgovorjeni klic od: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Aktivni klic"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Aktivni delovni klic"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Odhodni klic prek Wi-Fi-ja"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Aktivni delovni klic prek omrežja Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Aktivni klic prek omrežja Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Aktivni delovni klic prek omrežja Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Zadržano"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dohodni klic"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dohodni klic s fotografijo"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Pomemben klic s fotografijo, sporočilom, lokacijo"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Pomemben dohodni klic s prilogami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dohodni delovni klic"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dohodni klic prek Wi-Fi-ja"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dohodni delovni klic prek omrežja Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Dohodni klic prek omrežja Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Dohodni delovni klic prek omrežja Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Domnevno neželeni dohodni klic"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Dohodna zahteva za video"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Ni storitve"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Sprejmi videoklic"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Če želite poklicati, najprej izklopite način za letalo."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ni registrirano v omrežju."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilno omrežje ni na voljo."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobilno omrežje ni na voljo."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Če želite opraviti klic, vnesite veljavno številko."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Klicanje ni mogoče."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Začetek zaporedja MMI ..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Končaj klic"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferenčni klic"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Poteka klic"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Nadaljevanje klica prek prenosa podatkov v mobilnih omrežjih …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ni bilo mogoče preklopiti v omrežje Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videoklic bo še naprej potekal v mobilnem omrežju. Morda boste morali plačati standardne stroške prenosa podatkov."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Nadaljevanje klica prek prenosa podatkov v mobilnem omrežju …"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ni bilo mogoče preklopiti v omrežje Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videoklic bo še naprej potekal v mobilnem omrežju. Morda boste morali plačati standardne stroške prenosa podatkov."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Tega ne kaži več"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sq/strings.xml b/java/com/android/incallui/res/values-sq/strings.xml
index fd19642..76bb87b 100644
--- a/java/com/android/incallui/res/values-sq/strings.xml
+++ b/java/com/android/incallui/res/values-sq/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Telefonatë e humbur nga <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Telefonatë në vazhdim"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Telefonatë pune dalëse"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Telefonatë në vazhdim me Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Telefonatë pune dalëse përmes Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Telefonatë në vazhdim me Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Telefonatë pune dalëse me Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Në pritje"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Telefonatë hyrëse"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Telefonatë hyrëse me fotografi"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tel. e rëndësishme me foto, mesazh e vendndodhje"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Telefonatë hyrëse e rëndësishme me bashkëngjitje"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Telefonatë pune hyrëse"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Telefonatë hyrëse Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Telefonatë pune hyrëse përmes Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Telefonatë hyrëse me Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Telefonatë pune hyrëse me Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Telefonatë e dyshuar si e padëshiruar"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Kërkesë për video hyrëse"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Nuk ka shërbim"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Prano telefonatën me video"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Për të kryer telefonatë, së pari çaktivizo modalitetin e aeroplanit."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"I paregjistruar në rrjet."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rrjeti celular nuk mundësohet."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Rrjeti celular nuk mundësohet."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Për të kryer një telefonatë, fut një numër të vlefshëm."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Nuk mund të telefonojë."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Po fillon sekuencën MMI…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Mbylle telefonatën"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonatë konferencë"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Në telefonatë"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Po vazhdon telefonatën duke përdorur të dhënat celulare…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nuk mund të kalonte në rrjetin Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Telefonata me video do të mbetet në rrjetin celular. Mund të zbatohen tarifat standarde."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Po vazhdon telefonatën duke përdorur të dhënat celulare…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nuk mund të kalonte në rrjetin Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Telefonata me video do të mbetet në rrjetin celular. Mund të zbatohen tarifat standarde të të dhënave."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Mos e shfaq më këtë"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sr/strings.xml b/java/com/android/incallui/res/values-sr/strings.xml
index 4fa7a61..85e76a9 100644
--- a/java/com/android/incallui/res/values-sr/strings.xml
+++ b/java/com/android/incallui/res/values-sr/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Пропуштен позив од: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Актуелни позив"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Текући позив за Work"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Текући Wi-Fi позив"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Текући позив за Work преко Wi-Fi-ја"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Wi‑Fi позив у току"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Wi‑Fi пословни позив у току"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"На чекању"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Долазни позив"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Долазни позив са сликом"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важан долазни позив са сликом, поруком и локацијом"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важан долазни позив са прилозима"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Долазни позив за Work"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Долазни Wi-Fi позив"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Долазни позив за Work преко Wi-Fi-ја"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Долазни Wi‑Fi позив"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Долазни Wi‑Fi пословни позив"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Сумња на непожељан долазни позив"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Захтев за долазни видео позив"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Нема услуге"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Преузми видео позив"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Да бисте упутили позив, прво искључите режим рада у авиону."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Није регистровано на мрежи."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Мобилна мрежа није доступна."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Мобилна мрежа није доступна."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Да бисте упутили позив, унесите важећи број."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Позив није успео."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Покретање MMI секвенце"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завршите позив"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конференцијски позив"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"У позиву"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Позив се наставља помоћу мобилних података…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Пребацивање на Wi-Fi мрежу није успело"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видео позив ће остати на мобилној мрежи. Могу да важе стандардне накнаде за пренос података."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Позив се наставља помоћу мобилних података…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Пребацивање на Wi‑Fi мрежу није успело"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видео позив ће остати на мобилној мрежи. Важе стандардне накнаде за пренос података."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Не приказуј ово поново"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sv/strings.xml b/java/com/android/incallui/res/values-sv/strings.xml
index 6d58d90..4bbce1d 100644
--- a/java/com/android/incallui/res/values-sv/strings.xml
+++ b/java/com/android/incallui/res/values-sv/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Missat samtal från <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Pågående samtal"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Pågående jobbsamtal"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Pågående Wi-Fi-samtal"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Pågående jobbsamtal via Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Pågående Wi-Fi-samtal"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Pågående jobbsamtal på Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Parkerat"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Inkommande samtal"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkommande samtal med foto"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktigt inkommande samtal med foto, meddelande och plats"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktigt inkommande samtal med bilagor"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkommande jobbsamtal"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Inkommande Wi-Fi-samtal"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Inkommande jobbsamtal via Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Inkommande Wi-Fi-samtal"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Inkommande jobbsamtal på Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Inkommande misstänkt spamsamtal"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Inkommande begäran om videosamtal"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Ingen tjänst"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Svara på videosamtal"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Om du vill ringa ett samtal måste du först inaktivera flygplansläge."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Inte registrerat på nätverk."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Det finns inget mobilnät tillgängligt."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Inga tillgängliga mobilnätverk."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Ange ett giltigt nummer om du vill ringa ett samtal."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Det gick inte att ringa."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Startar sekvens för MMI-kod…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Avsluta samtal"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferenssamtal"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"I samtal"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Samtalet fortsätter med mobildata …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Det gick inte att växla till Wi-Fi-nätverk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videosamtalet förblir i mobilnätverket. Vanliga dataavgifter kan tillkomma."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Samtalet fortsätter med mobildata …"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Det gick inte att växla till Wi-Fi-nätverk"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videosamtalet förblir i mobilnätverket. Vanliga dataavgifter kan tillkomma."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Visa inte detta igen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sw/strings.xml b/java/com/android/incallui/res/values-sw/strings.xml
index 0bb1b8c..17c3a52 100644
--- a/java/com/android/incallui/res/values-sw/strings.xml
+++ b/java/com/android/incallui/res/values-sw/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Simu ambayo hukujibu kutoka <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Simu inayoendelea"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Simu ya kazi inayoendelea"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Simu ya Wi-Fi inayoendelea"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Simu ya Wi-Fi ya kazi inayoendelea"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Simu ya Wi-Fi inaendelea"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Simu ya Wi-Fi ya kazi inaendelea"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Inangoja"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Unapigiwa simu"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Simu inayoingia yenye picha"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Simu muhimu yenye picha, ujumbe na mahali"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Simu muhimu inayoingia yenye viambatisho"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Simu ya kazi inayoingia"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Simu ya Wi-Fi inayoingia"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Simu ya Wi-Fi ya kazi inayoingia"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Simu ya Wi-Fi inaingia"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Simu ya Wi-Fi ya kazi inaingia"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Simu inayoingia inashukiwa kuwa taka"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Ombi  linaloingia la video"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Hakuna huduma"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Pokea Simu ya Video"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Kupiga simu, kwanza zima hali ya ndegeni."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Haijasajiliwa kwa mitandao"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mitandao ya simu za mkononi haipatikani"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mtandao wa simu haupatikani."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Ili upige simu, weka nambari sahihi."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Haiwezi kupiga simu."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Inaanzisha msururu wa MMI…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Kata simu"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Simu ya kongamano"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Mazungumzo ya simu yanaendelea"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Endelea na mazungumzo ya simu ukitumia data ya kifaa cha mkononi…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Imeshindwa kuhamia mtandao wa Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Hangout ya video itaendelea kwenye mtandao wa simu. Huenda ukatozwa gharama za kawaida za data."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Endelea na mazungumzo ya simu ukitumia data ya simu…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Imeshindwa kuhamia mtandao wa Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Hangout ya video itaendelea kwenye mtandao wa simu. Huenda ukatozwa gharama za kawaida za data."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Usiionyeshe tena"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ta/strings.xml b/java/com/android/incallui/res/values-ta/strings.xml
index bae8d6a..bb228a0 100644
--- a/java/com/android/incallui/res/values-ta/strings.xml
+++ b/java/com/android/incallui/res/values-ta/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> இடமிருந்து தவறிய அழைப்பு"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"செயலில் இருக்கும் அழைப்பு"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"வெளிச்செல்லும் அழைப்பு (பணி)"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"வெளிச்செல்லும் வைஃபை அழைப்பு"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"வெளிச்செல்லும் வைஃபை அழைப்பு (பணி)"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"செயலில் இருக்கும் வைஃபை அழைப்பு"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"செயலில் இருக்கும் வைஃபை அழைப்பு (பணி)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"காத்திருப்பில்"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"உள்வரும் அழைப்பு"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"படத்துடன் உள்வரும் அழைப்பு"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"படம், செய்தி, இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"இணைப்புகளுடன் உள்வரும் முக்கியமான அழைப்பு"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"உள்வரும் அழைப்பு (பணி)"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"உள்வரும் வைஃபை அழைப்பு"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"உள்வரும் வைஃபை அழைப்பு (பணி)"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"உள்வரும் வைஃபை அழைப்பு"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"உள்வரும் வைஃபை அழைப்பு (பணி)"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"உள்வரும் சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பு"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"உள்வரும் வீடியோ கோரிக்கை"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"சேவை இல்லை"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"வீடியோ அழைப்பை எடு"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"அழைப்பதற்கு, முதலில் விமானப் பயன்முறையை முடக்கவும்."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"நெட்வொர்க்கில் பதிவுசெய்யப்படவில்லை."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"செல்லுலார் நெட்வொர்க் கிடைக்கவில்லை."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"மொபைல் நெட்வொர்க் கிடைக்கவில்லை."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"அழைக்க, சரியான எண்ணை உள்ளிடவும்."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"அழைக்க முடியாது."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI வரிசையைத் தொடங்குகிறது..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"அழைப்பைத் துண்டிக்கும்"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"குழு அழைப்பு"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"அழைப்பில்"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"செல்லுலார் தரவைப் பயன்படுத்தி அழைப்பைத் தொடர்கிறது…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"வைஃபை நெட்வொர்க்கிற்கு மாற முடியவில்லை"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"செல்லுலார் நெட்வொர்க்கைப் பயன்படுத்தி தொடர்ந்து வீடியோ அழைப்பைச் செய்யலாம். வழக்கமான தரவுக் கட்டணங்கள் விதிக்கப்படக்கூடும்."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"மொபைல் தரவைப் பயன்படுத்தி அழைப்பைத் தொடர்கிறது…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"வைஃபை நெட்வொர்க்கிற்கு மாற முடியவில்லை"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"மொபைல் நெட்வொர்க்கைப் பயன்படுத்தி தொடர்ந்து வீடியோ அழைப்பைச் செய்யலாம். வழக்கமான தரவுக் கட்டணங்கள் விதிக்கப்படக்கூடும்."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"இதை மீண்டும் காட்டாதே"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-te/strings.xml b/java/com/android/incallui/res/values-te/strings.xml
index 6b83388..a5da32a 100644
--- a/java/com/android/incallui/res/values-te/strings.xml
+++ b/java/com/android/incallui/res/values-te/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> నుండి సమాధానం ఇవ్వని కాల్"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"కాల్ కొనసాగుతోంది"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"కార్యాలయ కాల్ కొనసాగుతోంది"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi కాల్ కొనసాగుతోంది"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Wi-Fi కార్యాలయ కాల్ కొనసాగుతోంది"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"మాట్లాడుతున్న Wi‑Fi కాల్"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"మాట్లాడుతున్న Wi‑Fi కార్యాలయ కాల్"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"హోల్డ్‌లో ఉంది"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ఇన్‌కమింగ్ కాల్"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ఫోటోతో ఇన్‌కమింగ్ కాల్"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ఫోటో, సందేశం, స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"జోడింపులతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ఇన్‌కమింగ్ కార్యాలయ కాల్"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi కాల్ వస్తోంది"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ఇన్‌కమింగ్ Wi-Fi కార్యాలయ కాల్"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"ఇన్‌కమింగ్ Wi-Fi కాల్"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"ఇన్‌కమింగ్ Wi-Fi కార్యాలయ కాల్"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"అనుమానాస్పద స్పామ్ కాల్ వస్తోంది"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ఇన్‌కమింగ్ వీడియో అభ్యర్థన"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"సేవ లేదు"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"వీడియో కాల్‌ను తీయి"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"కాల్ చేయడానికి, మొదట ఎయిర్‌ప్లైన్ మోడ్‌ను ఆపివేయండి."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"నెట్‌వర్క్‌లో నమోదు కాలేదు."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"సెల్యులార్ నెట్‌వర్క్ అందుబాటులో లేదు."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"మొబైల్ నెట్‌వర్క్ అందుబాటులో లేదు."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"కాల్ చేయడానికి, చెల్లుబాటు అయ్యే నంబర్‌ను నమోదు చేయండి."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"కాల్ చేయలేరు."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI శ్రేణిని ప్రారంభిస్తోంది…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"కాల్‌ను ముగిస్తుంది"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"కాన్ఫరెన్స్ కాల్"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"కాల్‌లో ఉన్నారు"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"సెల్యులార్ డేటాను ఉపయోగించి కాల్‌ను కొనసాగిస్తోంది…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi నెట్‌వర్క్‌కి మార్చలేకపోయింది"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"వీడియో కాల్ సెల్యులార్ నెట్‌వర్క్‌లో కొనసాగుతుంది. ప్రామాణిక డేటా ఛార్జీలు వర్తించవచ్చు."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"మొబైల్ డేటాను ఉపయోగించి కాల్‌ను కొనసాగిస్తోంది…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi నెట్‌వర్క్‌కి మార్చడం సాధ్యపడలేదు"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"వీడియో కాల్ మొబైల్ నెట్‌వర్క్‌లో కొనసాగుతుంది. ప్రామాణిక డేటా ఛార్జీలు వర్తించవచ్చు."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"దీన్ని మళ్లీ చూపవద్దు"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-th/strings.xml b/java/com/android/incallui/res/values-th/strings.xml
index 11023b9..102faf2 100644
--- a/java/com/android/incallui/res/values-th/strings.xml
+++ b/java/com/android/incallui/res/values-th/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"สายที่ไม่ได้รับจาก <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"โทรต่อเนื่อง"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"กำลังอยู่ในสายจากที่ทำงาน"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"กำลังโทรผ่าน Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"กำลังอยู่ในสายจากที่ทำงานผ่าน Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"กำลังโทรผ่าน Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"กำลังอยู่ในสายจากที่ทำงานผ่าน Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"พักสาย"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"สายเรียกเข้า"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"สายเรียกเข้าพร้อมรูปภาพ"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"สายเรียกเข้าที่สำคัญพร้อมรูปภาพ ข้อความ และตำแหน่ง"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"สายเรียกเข้าที่สำคัญพร้อมไฟล์แนบ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"มีสายเรียกเข้าจากที่ทำงาน"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"สายโทรเข้าผ่าน Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"มีสายเรียกเข้าจากที่ทำงานผ่าน Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"สายโทรเข้าผ่าน Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"มีสายเรียกเข้าจากที่ทำงานผ่าน Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"สายเรียกเข้าที่สงสัยว่าเป็นสแปม"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"คำขอโทรเข้าเป็นวิดีโอ"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"ไม่มีบริการ"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"รับสายแฮงเอาท์วิดีโอ"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"หากต้องการโทรออก ให้ปิดโหมดใช้งานบนเครื่องบินก่อน"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"ยังไม่ได้ลงทะเบียนบนเครือข่าย"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"เครือข่ายมือถือใช้งานไม่ได้"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"เครือข่ายมือถือใช้งานไม่ได้"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"หากต้องการโทรออก โปรดป้อนหมายเลขที่ถูกต้อง"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"ไม่สามารถโทรได้"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"กำลังเริ่มต้นลำดับ MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"วางสาย"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"การประชุมสาย"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"อยู่ในสาย"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"กำลังทำการโทรต่อโดยใช้ข้อมูลเครือข่ายมือถือ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"ไม่สามารถเปลี่ยนไปใช้เครือข่าย Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"แฮงเอาท์วิดีโอจะยังคงอยู่ในเครือข่ายมือถือ อาจมีการเรียกเก็บค่าบริการข้อมูลมาตรฐาน"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"โทรต่อโดยใช้อินเทอร์เน็ตมือถือ..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ไม่สามารถเปลี่ยนไปใช้เครือข่าย Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"แฮงเอาท์วิดีโอจะยังคงอยู่ในเครือข่ายมือถือ อาจมีการเรียกเก็บค่าบริการข้อมูลมาตรฐาน"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"อย่าแสดงสิ่งนี้อีก"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-tl/strings.xml b/java/com/android/incallui/res/values-tl/strings.xml
index 00a4623..9cc2f54 100644
--- a/java/com/android/incallui/res/values-tl/strings.xml
+++ b/java/com/android/incallui/res/values-tl/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Hindi nasagot ang tawag mula kay <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Kasalukuyang tawag"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Kasalukuyang tawag sa trabaho"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Isinasagawang tawag sa Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Kasalukuyang tawag sa trabaho sa pamamagitan ng Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Kasalukuyang isinasagawang tawag sa Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Kasalukuyang isinasagawang tawag sa trabaho gamit ang Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Naka-hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Papasok na tawag"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Papasok na tawag na may larawan"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Mahalagang papasok na tawag na may larawan, mensahe, at lokasyon"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Mahalagang papasok na tawag na may mga attachment"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Papasok na tawag sa trabaho"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Papasok na tawag sa Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Papasok na tawag sa trabaho sa pamamagitan ng Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Papasok na tawag sa Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Papasok na tawag sa trabaho gamit ang Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Papasok na pinaghihinalaang spam na tawag"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Papasok na kahilingan ng video"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Walang serbisyo"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Sagutin ang Video Call"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Upang tumawag, paki-off ang Airplane mode."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Hindi nakarehistro sa network."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Hindi available ang cellular network"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Hindi available ang mobile network."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Upang tumawag, maglagay ng wastong numero."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Hindi makatawag."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Sinisimulan ang pagkakasunud-sunod ng MMI…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Tapusin ang tawag"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Nasa tawag"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Ipinagpapatuloy ang tawag gamit ang cellular data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Hindi makalipat sa Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Mananatili sa cellular network ang video call. Maaaring may mga babayaran sa data."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Ipinagpapatuloy ang tawag gamit ang mobile data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Hindi makalipat sa Wi-Fi network"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Mananatili sa mobile network ang video call. Maaaring may mga babayaran sa data."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Huwag itong ipakitang muli"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-tr/strings.xml b/java/com/android/incallui/res/values-tr/strings.xml
index 9820a69..9126624 100644
--- a/java/com/android/incallui/res/values-tr/strings.xml
+++ b/java/com/android/incallui/res/values-tr/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Cevapsız çağrı: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Devam eden çağrılar"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Süren iş çağrısı"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Giden kablosuz çağrı"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Süren kablosuz iş çağrısı"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Devam eden kablosuz çağrı"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"İşle ilgili devam eden kablosuz çağrı"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Beklemede"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Gelen çağrı"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Fotoğraf eklenmiş gelen çağrı"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Fotoğraf, mesaj ve konum eklenmiş önemli çağrı"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ek iliştirilmiş önemli gelen çağrı"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Gelen iş çağrısı"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Gelen kablosuz çağrı"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Gelen kablosuz iş çağrısı"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Gelen kablosuz çağrı"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"İşle ilgili gelen kablosuz çağrı"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Spam olabilecek gelen arama"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Gelen video isteği"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Hizmet yok"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Video Görüşmesini Al"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Bir çağrı yapmak için öncelikle Uçak modunu kapatın."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ağda kayıtlı değil."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Hücresel ağ kullanılamıyor."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobil ağ kullanılamıyor."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Telefon etmek için geçerli bir numara girin."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Arama yapılamıyor."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI dizisi başlatılıyor..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Çağrı sonlandırılır"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferans çağrısı"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Konferans çağrısında"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Görüşmeye hücresel veri kullanılarak devam ediliyor…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Kablosuz ağa geçilemedi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video görüşmesi hücresel ağda devam edecek. Standart veri ücretleri alınabilir."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Görüşmeye mobil veri kullanılarak devam ediliyor…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kablosuz ağa geçilemedi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Görüntülü görüşme mobil ağda devam edecek. Standart veri ücretleri alınabilir."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Bunu bir daha gösterme"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-uk/strings.xml b/java/com/android/incallui/res/values-uk/strings.xml
index b3b297d..30c202c 100644
--- a/java/com/android/incallui/res/values-uk/strings.xml
+++ b/java/com/android/incallui/res/values-uk/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Пропущений виклик: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Поточний виклик"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Поточний дзвінок на робочий телефон"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Активний дзвінок через Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Поточний дзвінок на робочий телефон через Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Поточний дзвінок через Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Поточний дзвінок на робочий телефон через Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Очікує"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Вхідний виклик"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Вхідний дзвінок із фото"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важливий дзвінок із фото, повідомленням і адресою"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важливий вхідний дзвінок із вкладеними файлами"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Вхідний дзвінок на робочий телефон"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Вхідний дзвінок через Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Вхідний дзвінок на робочий телефон через Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Вхідний дзвінок через Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Вхідний дзвінок на робочий телефон через Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Цей дзвінок може бути спамом"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Запит на вхідний відеодзвінок"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Нема служби"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Прийняти відеодзвінок"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Щоб установ. з\'єднання, споч. вимк. режим польоту."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Не зареєстровано в мережі."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Мобільна мережа недоступна."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Мобільна мережа недоступна."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Щоб зателефонувати, введіть дійсний номер."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Неможливо зателефонувати."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Запуск ряду MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завершити виклик"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конференц-зв’язок"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Триває виклик"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Продовження виклику через мобільний трафік…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Не вдалося перейти в мережу Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Відеодзвінок продовжиться в мобільній мережі. Діють стандартні тарифи."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Продовження виклику з використанням мобільного Інтернету…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Не вдалося перейти на мережу Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Відеодзвінок продовжиться з використанням мобільного Інтернету. Діють стандартні тарифи."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Більше не показувати це"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ur/strings.xml b/java/com/android/incallui/res/values-ur/strings.xml
index e3326a2..8e70bad 100644
--- a/java/com/android/incallui/res/values-ur/strings.xml
+++ b/java/com/android/incallui/res/values-ur/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> کی جانب سے چھوٹی ہوئی کال"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"جاری کال"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"کام سے متعلق جاری کال"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"‏Wi-Fi کال جاری ہے"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏کام سے متعلق جاری Wi-Fi کال"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"‏جاری Wi-Fi کال"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"‏کام سے متعلق جاری Wi-Fi کال"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ہولڈ پر"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"آنے والی کال"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"تصویر کے ساتھ آنے والی کال"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"تصویر، پیغام اور مقام کے ساتھ آنے والی اہم کال"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"منسلکات کے ساتھ آنے والی اہم کال"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"کام سے متعلق آنے والی کال"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏Wi-Fi کال آ رہی ہے"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏کام سے متعلق آنے والی Wi-Fi کال"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"‏Wi-Fi کال آ رہی ہے"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"‏کام سے متعلق آنے والی Wi-Fi کال"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"آنے والی مشتبہ سپام کال"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"اِن کمنگ ویڈیو درخواست"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"کوئی سروس نہیں ہے"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"ویڈیو کال لیں"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"کال کرنے کیلئے، پہلے ہوائی جہاز طرز کو آف کریں۔"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"نیٹ ورک پر رجسٹرڈ نہیں ہے۔"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"سیلولر نیٹ ورک دستیاب نہیں ہے۔"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"موبائل نیٹ ورک دستیاب نہیں ہے۔"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"کال کرنے کیلئے، ایک درست نمبر درج کریں۔"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"کال نہیں کر سکتے۔"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"‏MMI ترتیب شروع ہو رہی ہے…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"کال ختم کریں"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"کانفرنس کال"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"کال میں"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"سیلولر ڈیٹا استعمال کرکے کال جاری ہے"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"‏Wi-Fi نیٹ ورک پر سوئچ نہیں ہو سکا"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ویڈیو کال سیلولر نیٹ ورک پر رہے گی۔ ڈیٹا کے معیاری چارجز کا اطلاق ہو سکتا ہے۔"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"موبائل ڈیٹا استعمال کرکے کال جاری ہے"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏Wi-Fi نیٹ ورک پر سوئچ نہیں ہو سکا"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ویڈیو کال موبائل نیٹ ورک پر رہے گی۔ ڈیٹا کے معیاری چارجز کا اطلاق ہو سکتا ہے۔"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"اسے دوبارہ مت دکھائیں"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-uz/strings.xml b/java/com/android/incallui/res/values-uz/strings.xml
index b04972f..c460f95 100644
--- a/java/com/android/incallui/res/values-uz/strings.xml
+++ b/java/com/android/incallui/res/values-uz/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> chaqiruvi javobsiz qoldi"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Joriy qo‘ng‘iroq"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chiquvchi ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chiquvchi Wi-Fi qo‘ng‘irog‘i"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chiquvchi Wi-Fi ishchi qo‘ng‘irog‘i"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Joriy Wi-Fi qo‘ng‘iroq"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Joriy Wi-Fi qo‘ng‘iroq (ish)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Kutmoqda"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Kiruvchi chaqiruv"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Suratga ega kiruvchi chaqiruv"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Surat, xabar va joy. ax. ega muhim kiruv. chaqiruv"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Biriktirmalarga ega muhim kiruvchi chaqiruv"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Kiruvchi ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Kiruvchi Wi-Fi qo‘ng‘irog‘i"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Kiruvchi Wi-Fi ishchi qo‘ng‘irog‘i"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Kiruvchi Wi-Fi qo‘ng‘iroq"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Kiruvchi Wi-Fi qo‘ng‘iroq (ish)"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Shubhali kiruvchi qo‘ng‘iroq"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Kiruvchi video so\'rovi"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Xizmat mavjud emas"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Video qo‘ng‘iroq. qabul qilish"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Qo‘ng‘iroq qilish uchun, avval \"Parvoz rejimi\" o‘chirilishi kerak."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Tarmoqda ro‘yxatdan o‘tmagan."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobil tarmoq mavjud emas."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Uyali aloqa tarmog‘i mavjud emas."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Qo‘ng‘iroq qilish uchun raqamni to‘g‘ri kiriting."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Qo‘ng‘iroq qilib bo‘lmadi."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI tartibi ishga tushmoqda..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Qo‘ng‘iroqni tugatish"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferens-aloqa"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Qo‘ng‘iroq davom etmoqda"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Qo‘ng‘iroq mobil internet orqali davom ettirilmoqda…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi tarmog‘iga o‘tib bo‘lmadi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video qo‘ng‘iroq uyali tarmoqda davom etilaveradi. Internet uchun operator tarifi bo‘yicha haq olinishi mumkin."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Qo‘ng‘iroq mobil internetga o‘tkazilmoqda…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi tarmog‘iga o‘tib bo‘lmadi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video qo‘ng‘iroq mobil internet orqali davom ettiriladi. Internet uchun operator tarifi bo‘yicha haq olinishi mumkin."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Bu xabar boshqa ko‘rsatilmasin"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-vi/strings.xml b/java/com/android/incallui/res/values-vi/strings.xml
index b466b02..8c0dbce 100644
--- a/java/com/android/incallui/res/values-vi/strings.xml
+++ b/java/com/android/incallui/res/values-vi/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Cuộc gọi nhỡ từ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Cuộc gọi đang thực hiện"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Cuộc gọi đang diễn ra về công việc"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Cuộc gọi đang diễn ra qua Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Cuộc gọi đang diễn ra qua Wi-Fi về công việc"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Cuộc gọi đang diễn ra qua Wi-Fi"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Cuộc gọi về công việc đang diễn ra qua Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Đang chờ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Cuộc gọi đến"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Cuộc gọi đến có ảnh"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Cuộc gọi đến quan trọng có ảnh, tin nhắn và vị trí"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Cuộc gọi đến quan trọng có tệp đính kèm"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Cuộc gọi đến về công việc"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Cuộc gọi đến qua Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Cuộc gọi đến qua Wi-Fi về công việc"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Cuộc gọi đến qua Wi-Fi"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Cuộc gọi đến về công việc qua Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Cuộc gọi spam đến bị nghi ngờ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Yêu cầu video đến"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Không có dịch vụ nào"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Nhận cuộc gọi điện video"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Để thực hiện cuộc gọi, trước tiên, hãy tắt chế độ trên Máy bay."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Chưa được đăng ký trên mạng."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Không có mạng di động."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mạng di động không khả dụng."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Để thực hiện cuộc gọi, hãy nhập một số hợp lệ."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Không thực hiện được cuộc gọi."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Khởi động chuỗi MMI…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Kết thúc cuộc gọi"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Cuộc gọi nhiều bên"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Đang trong cuộc gọi"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Đang tiếp tục cuộc gọi bằng cách sử dụng dữ liệu di động…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Không thể chuyển sang mạng Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Cuộc gọi điện video sẽ duy trì trên mạng di động. Có thể áp dụng phí dữ liệu chuẩn."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Đang tiếp tục cuộc gọi bằng cách sử dụng dữ liệu di động…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Không thể chuyển sang mạng Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Cuộc gọi điện video sẽ tiếp tục trên mạng di động. Bạn có thể phải trả phí dữ liệu chuẩn."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Không hiển thị lại"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zh-rCN/strings.xml b/java/com/android/incallui/res/values-zh-rCN/strings.xml
index e26ab0c..4ede0cb 100644
--- a/java/com/android/incallui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rCN/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"来自<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>的未接电话"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"当前通话"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"工作通话进行中"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"正在进行 WLAN 通话"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"WLAN 工作通话进行中"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"正在进行 WLAN 通话"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"正在进行 WLAN 工作通话"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"保持"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"来电"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"包含照片的来电"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"包含照片、讯息和位置信息的重要来电"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"包含附件的重要来电"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"工作来电"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"WLAN 来电"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"WLAN 工作来电"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"WLAN 来电"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"WLAN 工作来电"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"有疑似骚扰来电"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"收到视频通话邀请"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"无服务"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"接通视频通话"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"要进行呼叫，请先关闭飞行模式。"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"尚未注册网络。"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"无法连接到移动网络。"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"无法连接到移动网络。"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"要拨打电话，请输入有效的电话号码。"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"无法拨打该电话。"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"正在启动 MMI 序列..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"结束通话"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"电话会议"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"正在通话"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"正在使用移动数据网络继续通话…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"无法切换到 WLAN 网络"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"系统将使用移动网络继续视频通话。这可能会产生标准数据流量费。"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"正在使用移动数据继续通话…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"无法切换到 WLAN 网络"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"系统将使用移动网络继续视频通话。这可能会产生标准数据流量费。"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"不再显示"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zh-rHK/strings.xml b/java/com/android/incallui/res/values-zh-rHK/strings.xml
index 5eb8892..c4934ea 100644
--- a/java/com/android/incallui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rHK/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"來自 <xliff:g id="MISSED_CALL_FROM">%s</xliff:g> 的未接來電"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"通話中"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"正在進行工作通話"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"正在進行 Wi-Fi 通話"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"正在進行 Wi-Fi 工作通話"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"正在進行 Wi-Fi 通話"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"正在進行 Wi-Fi 工作通話"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"保留通話"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"來電"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"附有相片的來電"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"附有相片、訊息和位置的重要來電"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"附有附件的重要來電"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"工作來電"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi 來電"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Wi-Fi 工作來電"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Wi-Fi 來電"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Wi-Fi 工作來電"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"疑似收到垃圾來電"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"收到視像要求"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"沒有服務"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"接受視像通話"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"請先關閉飛行模式後再撥打電話。"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"未在網絡上完成註冊。"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"無法連線至流動網絡。"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"無法使用流動網絡。"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"要撥打電話，請輸入有效的號碼。"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"無法通話。"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"開始 MMI 序列..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"結束通話"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"會議通話"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"正在通話"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"使用流動數據繼續通話…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"無法切換為 Wi-Fi 網絡"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"視像通話仍會使用流動網絡 (可能需要支付標準數據用量費用)。"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"使用流動數據繼續通話…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"無法切換為 Wi-Fi 網絡"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"視像通話仍會使用流動網絡 (可能需要支付標準數據用量費用)。"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"不要再顯示此訊息"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zh-rTW/strings.xml b/java/com/android/incallui/res/values-zh-rTW/strings.xml
index 9f02866..9b85a28 100644
--- a/java/com/android/incallui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rTW/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"來自 <xliff:g id="MISSED_CALL_FROM">%s</xliff:g> 的未接來電"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"通話中"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"進行中的公司通話"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"撥出的 Wi-Fi 電話"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"進行中的公司通話 (透過 Wi-Fi)"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"進行中的通話 (透過 Wi-Fi)"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"進行中的公司通話 (透過 Wi-Fi)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"通話保留"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"來電"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"包含相片的來電"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"包含相片、訊息和位置資訊的重要來電"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"包含附件的重要來電"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"公司來電"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"撥入的 Wi-Fi 電話"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"公司來電 (透過 Wi-Fi)"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"來電 (透過 Wi-Fi)"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"公司來電 (透過 Wi-Fi)"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"可疑的騷擾/廣告來電"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"收到視訊要求"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"沒有服務"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"接聽視訊通話"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"撥號前，請先關閉飛航模式。"</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"尚未註冊網路。"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"無法連線到行動網路。"</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"無法使用行動網路。"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"如要撥打電話，請輸入有效的號碼。"</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"無法通話。"</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"開始 MMI 序列…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"結束通話"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"電話會議"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"通話中"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"使用行動數據繼續進行通話…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"無法切換至 Wi-Fi 網路"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"視訊通話將繼續透過行動網路進行 (可能需支付一般數據傳輸費用)。"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"使用行動網路繼續進行通話…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"無法切換至 Wi-Fi 網路"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"視訊通話將繼續透過行動網路進行 (可能需支付一般數據傳輸費用)。"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"不要再顯示這項說明"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zu/strings.xml b/java/com/android/incallui/res/values-zu/strings.xml
index db415cc..bc5a927 100644
--- a/java/com/android/incallui/res/values-zu/strings.xml
+++ b/java/com/android/incallui/res/values-zu/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Uphuthelwe ikholi kusukela ku-<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Ikholi eqhubekayo"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ikholi yomsebenzi eqhubekayo"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ikholi ye-Wi-Fi eqhubekayo"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ikholi yomsebenzi eqhubekayo ye-Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Ikholi ye-Wi-Fi eqhubekayo"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Ikholi yomsebenzi eqhubekayo ye-Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ibambile"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Ikholi engenayo"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Ikholi engenayo enesithombe"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Ikholi engenayo ebalulekile enesithombe, umlayezo nendawo"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ikholi engenayo ebalulekile enokunamathiselwe kwi-imeyili"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ikholi engenayo yomsebenzi"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Ikholi ye-Wi-Fi engenayo"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Ikholi engenayo yomsebenzi ye-Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Ikholi ye-Wi-Fi engenayo"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Ikholi engenayo yomsebenzi ye-Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Ikholi engenayo osolisayo kagaxekile"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Isicelo sevidiyo engenayo"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Ayikho isevisi"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Thatha ikholi yevidiyo"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Ukwenza ikholi, vala kuqala imodi Yendiza."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ayibhalisiwe kwinethiwekhi."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Inethiwekhi yeselula ayitholakali."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Inethiwekhi yefoni ayitholakali"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Ukuze wenze ikholi, faka inombolo evumelekile."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Ayikwazi ukushaya."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iqalisa ukulandelana kwe-MMI..."</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Qeda ikholi"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Ikholi yengqungquthela"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Isecingweni"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Iqhuba ikholi isebenzisa idatha yeselula…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ayikwazanga ukushintshela kunethiwekhi ye-Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Ikholi yevidiyo izohlala kunethiwekhi yeselula. Izindleko zedatha ejwayelekile zingasebenza."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Iqhubekisa ikholi isebenzisa idatha yeselula…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ayikwazanga ukushintshela kunethiwekhi ye-Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Ikholi yevidiyo izohlala ikunethiwekhi yeselula. Amashaji edatha avamile angasebenza."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ungabonisi lokhu futhi"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values/dimens.xml b/java/com/android/incallui/res/values/dimens.xml
index fb4934d..56b9ae1 100644
--- a/java/com/android/incallui/res/values/dimens.xml
+++ b/java/com/android/incallui/res/values/dimens.xml
@@ -58,6 +58,8 @@
 
   <dimen name="conference_call_manager_button_dimension">48dp</dimen>
 
+  <dimen name="return_to_call_initial_offset_y">120dp</dimen>
+
   <!-- Whether or not the landscape mode layout is currently being used -->
   <bool name="is_layout_landscape">false</bool>
 
diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml
index aede428..4113313 100644
--- a/java/com/android/incallui/res/values/strings.xml
+++ b/java/com/android/incallui/res/values/strings.xml
@@ -78,10 +78,10 @@
   <string name="notification_ongoing_work_call">Ongoing work call</string>
   <!-- The "label" of the in-call Notification for an ongoing call, which is being made over
        Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_ongoing_call_wifi">Ongoing Wi-Fi call</string>
+  <string name="notification_ongoing_call_wifi">Ongoing Wi\u2011Fi call</string>
   <!-- The "label" of the in-call Notification for an ongoing work call, which is being made
        over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_ongoing_work_call_wifi">Ongoing Wi-Fi work call</string>
+  <string name="notification_ongoing_work_call_wifi">Ongoing Wi\u2011Fi work call</string>
   <!-- The "label" of the in-call Notification for a call that's on hold -->
   <string name="notification_on_hold">On hold</string>
   <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] -->
@@ -126,10 +126,10 @@
   <string name="notification_incoming_work_call">Incoming work call</string>
   <!-- The "label" of the in-call Notification for an incoming ringing call,
        which is being made over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_incoming_call_wifi">Incoming Wi-Fi call</string>
+  <string name="notification_incoming_call_wifi">Incoming Wi\u2011Fi call</string>
   <!-- The "label" of the in-call Notification for an incoming ringing work call,
        which is being made over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_incoming_work_call_wifi">Incoming Wi-Fi work call</string>
+  <string name="notification_incoming_work_call_wifi">Incoming Wi\u2011Fi work call</string>
   <!-- The "label" of the in-call Notification for an incoming ringing spam call. -->
   <string name="notification_incoming_spam_call">Incoming suspected spam call</string>
   <!-- The "label" of the in-call Notification for upgrading an existing call to a video call. -->
@@ -190,7 +190,7 @@
        This string is currently unused (see comments in InCallActivity.java.) -->
   <string name="incall_error_emergency_only">Not registered on network.</string>
   <!-- In-call screen: call failure message displayed in an error dialog -->
-  <string name="incall_error_out_of_service">Cellular network not available.</string>
+  <string name="incall_error_out_of_service">Mobile network not available.</string>
   <!-- In-call screen: call failure message displayed in an error dialog -->
   <string name="incall_error_no_phone_number_supplied">To place a call, enter a valid number.</string>
   <!-- In-call screen: call failure message displayed in an error dialog -->
@@ -349,11 +349,11 @@
   <string name="generic_conference_call_name">In call</string>
 
   <!-- Displayed when handover from WiFi to Lte occurs during a video call -->
-  <string name="video_call_wifi_to_lte_handover_toast">Continuing call using cellular data…</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Continuing call using mobile data\u2026</string>
 
   <!-- Displayed when WiFi handover from LTE fails during a video call. -->
-  <string name="video_call_lte_to_wifi_failed_title">Couldn\'t switch to Wi-Fi network</string>
-  <string name="video_call_lte_to_wifi_failed_message">Video call will remain on cellular network. Standard
+  <string name="video_call_lte_to_wifi_failed_title">Couldn\'t switch to Wi\u2011Fi network</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video call will remain on the mobile network. Standard
     data charges may apply.
   </string>
   <string name="video_call_lte_to_wifi_failed_do_not_show">Do not show this again</string>
diff --git a/java/com/android/incallui/sessiondata/MultimediaFragment.java b/java/com/android/incallui/sessiondata/MultimediaFragment.java
index 85a60b6..3e6cdbb 100644
--- a/java/com/android/incallui/sessiondata/MultimediaFragment.java
+++ b/java/com/android/incallui/sessiondata/MultimediaFragment.java
@@ -107,6 +107,7 @@
   public View onCreateView(
       LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) {
     if (isSpam) {
+      LogUtil.i("MultimediaFragment.onCreateView", "show spam layout");
       return layoutInflater.inflate(R.layout.fragment_spam, viewGroup, false);
     }
 
@@ -116,23 +117,30 @@
     if (hasMap && MapsComponent.get(getContext()).getMaps().isAvailable()) {
       if (hasImage) {
         if (hasSubject) {
+          LogUtil.i("MultimediaFragment.onCreateView", "show text, image, location layout");
           return layoutInflater.inflate(
               R.layout.fragment_composer_text_image_frag, viewGroup, false);
         } else {
+          LogUtil.i("MultimediaFragment.onCreateView", "show image, location layout");
           return layoutInflater.inflate(R.layout.fragment_composer_image_frag, viewGroup, false);
         }
       } else if (hasSubject) {
+        LogUtil.i("MultimediaFragment.onCreateView", "show text, location layout");
         return layoutInflater.inflate(R.layout.fragment_composer_text_frag, viewGroup, false);
       } else {
+        LogUtil.i("MultimediaFragment.onCreateView", "show location layout");
         return layoutInflater.inflate(R.layout.fragment_composer_frag, viewGroup, false);
       }
     } else if (hasImage) {
       if (hasSubject) {
+        LogUtil.i("MultimediaFragment.onCreateView", "show text, image layout");
         return layoutInflater.inflate(R.layout.fragment_composer_text_image, viewGroup, false);
       } else {
+        LogUtil.i("MultimediaFragment.onCreateView", "show image layout");
         return layoutInflater.inflate(R.layout.fragment_composer_image, viewGroup, false);
       }
     } else {
+      LogUtil.i("MultimediaFragment.onCreateView", "show text layout");
       return layoutInflater.inflate(R.layout.fragment_composer_text, viewGroup, false);
     }
   }
@@ -155,11 +163,11 @@
       ((TextView) view.findViewById(R.id.spam_text)).setText(R.string.spam_message_text);
     }
 
-    TextView messageText = (TextView) view.findViewById(R.id.answer_message_text);
+    TextView messageText = view.findViewById(R.id.answer_message_text);
     if (messageText != null) {
       messageText.setText(getSubject());
     }
-    ImageView mainImage = (ImageView) view.findViewById(R.id.answer_message_image);
+    ImageView mainImage = view.findViewById(R.id.answer_message_image);
     if (mainImage != null) {
       Glide.with(this)
           .load(getImageUri())
@@ -185,6 +193,7 @@
                     Target<Drawable> target,
                     DataSource dataSource,
                     boolean isFirstResource) {
+                  LogUtil.enterBlock("MultimediaFragment.onResourceReady");
                   view.findViewById(R.id.loading_spinner).setVisibility(View.GONE);
                   return false;
                 }
@@ -192,7 +201,7 @@
           .into(mainImage);
       mainImage.setClipToOutline(true);
     }
-    FrameLayout fragmentHolder = (FrameLayout) view.findViewById(R.id.answer_message_frag);
+    FrameLayout fragmentHolder = view.findViewById(R.id.answer_message_frag);
     if (fragmentHolder != null) {
       fragmentHolder.setClipToOutline(true);
       Fragment mapFragment =
@@ -202,7 +211,7 @@
           .replace(R.id.answer_message_frag, mapFragment)
           .commitNow();
     }
-    avatarImageView = ((ImageView) view.findViewById(R.id.answer_message_avatar));
+    avatarImageView = view.findViewById(R.id.answer_message_avatar);
     if (avatarImageView != null) {
       avatarImageView.setVisibility(showAvatar ? View.VISIBLE : View.GONE);
     }
diff --git a/java/com/android/incallui/spam/SpamCallListListener.java b/java/com/android/incallui/spam/SpamCallListListener.java
index 547337e..b9c70eb 100644
--- a/java/com/android/incallui/spam/SpamCallListListener.java
+++ b/java/com/android/incallui/spam/SpamCallListListener.java
@@ -24,6 +24,7 @@
 import android.content.Intent;
 import android.graphics.drawable.Icon;
 import android.support.annotation.NonNull;
+import android.support.v4.os.BuildCompat;
 import android.telecom.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
@@ -35,8 +36,7 @@
 import com.android.dialer.logging.ContactLookupResult;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.notification.NotificationChannelId;
 import com.android.dialer.spam.Spam;
 import com.android.incallui.R;
 import com.android.incallui.call.CallList;
@@ -49,9 +49,8 @@
  * etc).
  */
 public class SpamCallListListener implements CallList.Listener {
+  static final int NOTIFICATION_ID = 1;
 
-  static final int NOTIFICATION_ID = R.id.notification_spam_call;
-  private static final String TAG = "SpamCallListListener";
   private final Context context;
   private final Random random;
 
@@ -65,10 +64,6 @@
     this.random = rand;
   }
 
-  private static String pii(String pii) {
-    return com.android.incallui.Log.pii(pii);
-  }
-
   @Override
   public void onIncomingCall(final DialerCall call) {
     String number = call.getNumber();
@@ -127,7 +122,6 @@
     if (call.isSpam()) {
       maybeShowSpamCallNotification(call);
     } else {
-      LogUtil.d(TAG, "Showing not spam notification for number=" + pii(call.getNumber()));
       maybeShowNonSpamCallNotification(call);
     }
   }
@@ -161,7 +155,7 @@
     if (callHistoryStatus == DialerCall.CALL_HISTORY_STATUS_PRESENT) {
       return false;
     } else if (callHistoryStatus == DialerCall.CALL_HISTORY_STATUS_UNKNOWN) {
-      LogUtil.i(TAG, "DialerCall history status is unknown, returning false");
+      LogUtil.i("SpamCallListListener.shouldShowAfterCallNotification", "history status unknown");
       return false;
     }
 
@@ -171,7 +165,7 @@
       return false;
     }
 
-    LogUtil.i(TAG, "shouldShowAfterCallNotification, returning true");
+    LogUtil.i("SpamCallListListener.shouldShowAfterCallNotification", "returning true");
     return true;
   }
 
@@ -179,7 +173,7 @@
    * Creates a notification builder with properties common among the two after call notifications.
    */
   private Notification.Builder createAfterCallNotificationBuilder(DialerCall call) {
-    Builder builder =
+    Notification.Builder builder =
         new Builder(context)
             .setContentIntent(
                 createActivityPendingIntent(call, SpamNotificationActivity.ACTION_SHOW_DIALOG))
@@ -187,7 +181,9 @@
             .setPriority(Notification.PRIORITY_DEFAULT)
             .setColor(context.getColor(R.color.dialer_theme_color))
             .setSmallIcon(R.drawable.ic_call_end_white_24dp);
-    NotificationChannelManager.applyChannel(builder, context, Channel.DEFAULT, null);
+    if (BuildCompat.isAtLeastO()) {
+      builder.setChannelId(NotificationChannelId.DEFAULT);
+    }
     return builder;
   }
 
@@ -234,21 +230,20 @@
     int thresholdForShowing = Spam.get(context).percentOfSpamNotificationsToShow();
     if (thresholdForShowing == 0) {
       LogUtil.d(
-          TAG,
-          "shouldThrottleSpamNotification, not showing - percentOfSpamNotificationsToShow is 0");
+          "SpamCallListListener.shouldThrottleSpamNotification",
+          "not showing - percentOfSpamNotificationsToShow is 0");
       return true;
     } else if (randomNumber < thresholdForShowing) {
       LogUtil.d(
-          TAG,
-          "shouldThrottleSpamNotification, showing " + randomNumber + " < " + thresholdForShowing);
+          "SpamCallListListener.shouldThrottleSpamNotification",
+          "showing " + randomNumber + " < " + thresholdForShowing);
       return false;
     } else {
       LogUtil.d(
-          TAG,
-          "shouldThrottleSpamNotification, not showing "
-              + randomNumber
-              + " >= "
-              + thresholdForShowing);
+          "SpamCallListListener.shouldThrottleSpamNotification",
+          "not showing %d >= %d",
+          randomNumber,
+          thresholdForShowing);
       return true;
     }
   }
@@ -257,15 +252,23 @@
     int randomNumber = random.nextInt(100);
     int thresholdForShowing = Spam.get(context).percentOfNonSpamNotificationsToShow();
     if (thresholdForShowing == 0) {
-      LogUtil.d(TAG, "Not showing non spam notification: percentOfNonSpamNotificationsToShow is 0");
+      LogUtil.d(
+          "SpamCallListListener.shouldThrottleNonSpamNotification",
+          "not showing non spam notification: percentOfNonSpamNotificationsToShow is 0");
       return true;
     } else if (randomNumber < thresholdForShowing) {
       LogUtil.d(
-          TAG, "Showing non spam notification: " + randomNumber + " < " + thresholdForShowing);
+          "SpamCallListListener.shouldThrottleNonSpamNotification",
+          "showing non spam notification: %d < %d",
+          randomNumber,
+          thresholdForShowing);
       return false;
     } else {
       LogUtil.d(
-          TAG, "Not showing non spam notification:" + randomNumber + " >= " + thresholdForShowing);
+          "SpamCallListListener.shouldThrottleNonSpamNotification",
+          "not showing non spam notification: %d >= %d",
+          randomNumber,
+          thresholdForShowing);
       return true;
     }
   }
diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java
index 6e45f92..609cb69 100644
--- a/java/com/android/incallui/video/impl/VideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/VideoCallFragment.java
@@ -122,6 +122,10 @@
           outline.setOval(x - radius, y - radius, x + radius, y + radius);
         }
       };
+
+  // Must use a named method reference as otherwise they do not match.
+  // https://stackoverflow.com/questions/28190304/two-exact-method-references-are-not-equal
+  private final Runnable updatePreviewVideoIfSafe = this::updatePreviewVideoScaling;
   private InCallScreenDelegate inCallScreenDelegate;
   private VideoCallScreenDelegate videoCallScreenDelegate;
   private InCallButtonUiDelegate inCallButtonUiDelegate;
@@ -350,6 +354,9 @@
     super.onPause();
     LogUtil.i("VideoCallFragment.onPause", null);
     inCallScreenDelegate.onInCallScreenPaused();
+
+    // If this is scheduled we should remove it
+    ThreadUtil.getUiThreadHandler().removeCallbacks(updatePreviewVideoIfSafe);
   }
 
   @Override
@@ -1050,7 +1057,7 @@
     previewOffBlurredImageView.setClipToOutline(true);
 
     // Wait until the layout pass has finished before updating the scaling
-    ThreadUtil.postOnUiThread(this::updatePreviewVideoScaling);
+    ThreadUtil.postOnUiThread(updatePreviewVideoIfSafe);
   }
 
   private void updateVideoOffViews() {
diff --git a/java/com/android/incallui/videotech/VideoTech.java b/java/com/android/incallui/videotech/VideoTech.java
index 7da74c0..34c3e2c 100644
--- a/java/com/android/incallui/videotech/VideoTech.java
+++ b/java/com/android/incallui/videotech/VideoTech.java
@@ -17,6 +17,7 @@
 package com.android.incallui.videotech;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
 import com.android.incallui.videotech.utils.SessionModificationState;
@@ -41,6 +42,8 @@
 
   void onCallStateChanged(Context context, int newState);
 
+  void onRemovedFromCallList();
+
   @SessionModificationState
   int getSessionModificationState();
 
@@ -62,7 +65,7 @@
 
   void unpause();
 
-  void setCamera(String cameraId);
+  void setCamera(@Nullable String cameraId);
 
   void setDeviceOrientation(int rotation);
 
diff --git a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
index d0a111d..85eb64e 100644
--- a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
+++ b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
@@ -17,6 +17,7 @@
 package com.android.incallui.videotech.empty;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
@@ -56,6 +57,9 @@
   public void onCallStateChanged(Context context, int newState) {}
 
   @Override
+  public void onRemovedFromCallList() {}
+
+  @Override
   public int getSessionModificationState() {
     return SessionModificationState.NO_REQUEST;
   }
@@ -90,7 +94,7 @@
   public void unpause() {}
 
   @Override
-  public void setCamera(String cameraId) {}
+  public void setCamera(@Nullable String cameraId) {}
 
   @Override
   public void setDeviceOrientation(int rotation) {}
diff --git a/java/com/android/incallui/videotech/ims/ImsVideoTech.java b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
index 2a0b7c5..a6cef7b 100644
--- a/java/com/android/incallui/videotech/ims/ImsVideoTech.java
+++ b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.os.Build;
+import android.support.annotation.Nullable;
 import android.telecom.Call;
 import android.telecom.Call.Details;
 import android.telecom.VideoProfile;
@@ -120,6 +121,9 @@
   }
 
   @Override
+  public void onRemovedFromCallList() {}
+
+  @Override
   public int getSessionModificationState() {
     return sessionModificationState;
   }
@@ -233,7 +237,7 @@
   }
 
   @Override
-  public void setCamera(String cameraId) {
+  public void setCamera(@Nullable String cameraId) {
     call.getVideoCall().setCamera(cameraId);
     call.getVideoCall().requestCameraCapabilities();
   }
diff --git a/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java b/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
index 386afdc..55ee2db 100644
--- a/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
+++ b/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
@@ -17,10 +17,13 @@
 package com.android.incallui.videotech.lightbringer;
 
 import android.content.Context;
+import android.os.Build;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.telecom.Call;
+import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.lightbringer.Lightbringer;
 import com.android.dialer.lightbringer.LightbringerListener;
 import com.android.incallui.video.protocol.VideoCallScreen;
@@ -31,15 +34,18 @@
 public class LightbringerTech implements VideoTech, LightbringerListener {
   private final Lightbringer lightbringer;
   private final VideoTechListener listener;
+  private final Call call;
   private final String callingNumber;
   private int callState = Call.STATE_NEW;
 
   public LightbringerTech(
       @NonNull Lightbringer lightbringer,
       @NonNull VideoTechListener listener,
+      @NonNull Call call,
       @NonNull String callingNumber) {
     this.lightbringer = Assert.isNotNull(lightbringer);
     this.listener = Assert.isNotNull(listener);
+    this.call = Assert.isNotNull(call);
     this.callingNumber = Assert.isNotNull(callingNumber);
 
     lightbringer.registerListener(this);
@@ -47,10 +53,11 @@
 
   @Override
   public boolean isAvailable(Context context) {
-    return ConfigProviderBindings.get(context)
-            .getBoolean("enable_lightbringer_video_upgrade", false)
+    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+        && ConfigProviderBindings.get(context).getBoolean("enable_lightbringer_video_upgrade", true)
         && callState == Call.STATE_ACTIVE
-        && lightbringer.isReachable(context, callingNumber);
+        && lightbringer.supportsUpgrade(context, callingNumber)
+        && TelecomManagerCompat.supportsHandover();
   }
 
   @Override
@@ -84,13 +91,16 @@
   }
 
   @Override
+  public void onRemovedFromCallList() {}
+
+  @Override
   public int getSessionModificationState() {
     return SessionModificationState.NO_REQUEST;
   }
 
   @Override
   public void upgradeToVideo() {
-    // TODO: upgrade to a video call
+    lightbringer.requestUpgrade(call);
   }
 
   @Override
@@ -124,17 +134,13 @@
   }
 
   @Override
-  public void pause() {
-    throw Assert.createUnsupportedOperationFailException();
-  }
+  public void pause() {}
 
   @Override
-  public void unpause() {
-    throw Assert.createUnsupportedOperationFailException();
-  }
+  public void unpause() {}
 
   @Override
-  public void setCamera(String cameraId) {
+  public void setCamera(@Nullable String cameraId) {
     throw Assert.createUnsupportedOperationFailException();
   }
 
diff --git a/java/com/android/voicemail/impl/TelephonyVvmConfigManager.java b/java/com/android/voicemail/impl/TelephonyVvmConfigManager.java
index b4def2f..046113c 100644
--- a/java/com/android/voicemail/impl/TelephonyVvmConfigManager.java
+++ b/java/com/android/voicemail/impl/TelephonyVvmConfigManager.java
@@ -21,7 +21,7 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.util.ArrayMap;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.voicemail.impl.utils.XmlUtils;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/java/com/android/voicemail/impl/VoicemailClientImpl.java b/java/com/android/voicemail/impl/VoicemailClientImpl.java
index 83c0523..83ce6c5 100644
--- a/java/com/android/voicemail/impl/VoicemailClientImpl.java
+++ b/java/com/android/voicemail/impl/VoicemailClientImpl.java
@@ -24,8 +24,8 @@
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.voicemail.VisualVoicemailTypeExtensions;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
diff --git a/java/com/android/voicemail/impl/VoicemailModule.java b/java/com/android/voicemail/impl/VoicemailModule.java
index 5a4e739..e689e47 100644
--- a/java/com/android/voicemail/impl/VoicemailModule.java
+++ b/java/com/android/voicemail/impl/VoicemailModule.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.support.v4.os.BuildCompat;
+import com.android.dialer.inject.ApplicationContext;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailPermissionHelper;
 import com.android.voicemail.stub.StubVoicemailClient;
@@ -31,7 +32,7 @@
 
   @Provides
   @Singleton
-  static VoicemailClient provideVoicemailClient(Context context) {
+  static VoicemailClient provideVoicemailClient(@ApplicationContext Context context) {
     if (!BuildCompat.isAtLeastO()) {
       VvmLog.i("VoicemailModule.provideVoicemailClient", "SDK below O");
       return new StubVoicemailClient();
diff --git a/java/com/android/voicemail/impl/imap/ImapHelper.java b/java/com/android/voicemail/impl/imap/ImapHelper.java
index f1bc8b2..94abe9b 100644
--- a/java/com/android/voicemail/impl/imap/ImapHelper.java
+++ b/java/com/android/voicemail/impl/imap/ImapHelper.java
@@ -251,13 +251,18 @@
     long time = messageDetails.getSentDate().getTime();
     String number = getNumber(messageDetails.getFrom());
     boolean isRead = Arrays.asList(messageDetails.getFlags()).contains(Flag.SEEN);
-    return Voicemail.createForInsertion(time, number)
-        .setPhoneAccount(mPhoneAccount)
-        .setSourcePackage(mContext.getPackageName())
-        .setSourceData(messageDetails.getUid())
-        .setIsRead(isRead)
-        .setTranscription(listener.getVoicemailTranscription())
-        .build();
+    Long duration = messageDetails.getDuration();
+    Voicemail.Builder builder =
+        Voicemail.createForInsertion(time, number)
+            .setPhoneAccount(mPhoneAccount)
+            .setSourcePackage(mContext.getPackageName())
+            .setSourceData(messageDetails.getUid())
+            .setIsRead(isRead)
+            .setTranscription(listener.getVoicemailTranscription());
+    if (duration != null) {
+      builder.setDuration(duration);
+    }
+    return builder.build();
   }
 
   /**
diff --git a/java/com/android/voicemail/impl/mail/Message.java b/java/com/android/voicemail/impl/mail/Message.java
index aea5d3e..ca65d3d 100644
--- a/java/com/android/voicemail/impl/mail/Message.java
+++ b/java/com/android/voicemail/impl/mail/Message.java
@@ -15,6 +15,7 @@
  */
 package com.android.voicemail.impl.mail;
 
+import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import java.util.Date;
 import java.util.HashSet;
@@ -64,6 +65,9 @@
 
   public abstract void setSentDate(Date sentDate) throws MessagingException;
 
+  @Nullable
+  public abstract Long getDuration() throws MessagingException;
+
   public abstract Address[] getRecipients(String type) throws MessagingException;
 
   public abstract void setRecipients(String type, Address[] addresses) throws MessagingException;
diff --git a/java/com/android/voicemail/impl/mail/internet/MimeHeader.java b/java/com/android/voicemail/impl/mail/internet/MimeHeader.java
index d41cdb3..8f08176 100644
--- a/java/com/android/voicemail/impl/mail/internet/MimeHeader.java
+++ b/java/com/android/voicemail/impl/mail/internet/MimeHeader.java
@@ -36,6 +36,7 @@
   public static final String HEADER_CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
   public static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition";
   public static final String HEADER_CONTENT_ID = "Content-ID";
+  public static final String HEADER_CONTENT_DURATION = "Content-Duration";
 
   /** Fields that should be omitted when writing the header using writeTo() */
   private static final String[] WRITE_OMIT_FIELDS = {
diff --git a/java/com/android/voicemail/impl/mail/internet/MimeMessage.java b/java/com/android/voicemail/impl/mail/internet/MimeMessage.java
index 5897206..39378a0 100644
--- a/java/com/android/voicemail/impl/mail/internet/MimeMessage.java
+++ b/java/com/android/voicemail/impl/mail/internet/MimeMessage.java
@@ -15,7 +15,9 @@
  */
 package com.android.voicemail.impl.mail.internet;
 
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import com.android.voicemail.impl.VvmLog;
 import com.android.voicemail.impl.mail.Address;
 import com.android.voicemail.impl.mail.Body;
 import com.android.voicemail.impl.mail.BodyPart;
@@ -197,6 +199,28 @@
   }
 
   @Override
+  @Nullable
+  public Long getDuration() {
+    String durationHeader = null;
+    try {
+      durationHeader = getFirstHeader(MimeHeader.HEADER_CONTENT_DURATION);
+    } catch (MessagingException e) {
+      VvmLog.e("MimeMessage.getDuration", "cannot retrieve header: ", e);
+      return null;
+    }
+    if (durationHeader == null) {
+      VvmLog.w("MimeMessage.getDuration", "message missing Content-Duration header");
+      return null;
+    }
+    try {
+      return Long.valueOf(durationHeader);
+    } catch (NumberFormatException e) {
+      VvmLog.w("MimeMessage.getDuration", "cannot parse duration " + durationHeader);
+      return null;
+    }
+  }
+
+  @Override
   public String getContentType() throws MessagingException {
     final String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);
     if (contentType == null) {
diff --git a/java/com/android/voicemail/impl/mail/store/imap/ImapConstants.java b/java/com/android/voicemail/impl/mail/store/imap/ImapConstants.java
index 88ec0ed..fd56952 100644
--- a/java/com/android/voicemail/impl/mail/store/imap/ImapConstants.java
+++ b/java/com/android/voicemail/impl/mail/store/imap/ImapConstants.java
@@ -27,7 +27,7 @@
   public static final String FETCH_FIELD_BODY_PEEK_SANE =
       String.format(Locale.US, "BODY.PEEK[]<0.%d>", ImapStore.FETCH_BODY_SANE_SUGGESTED_SIZE);
   public static final String FETCH_FIELD_HEADERS =
-      "BODY.PEEK[HEADER.FIELDS (date subject from content-type to cc message-id)]";
+      "BODY.PEEK[HEADER.FIELDS (date subject from content-type to cc message-id content-duration)]";
 
   public static final String ALERT = "ALERT";
   public static final String APPEND = "APPEND";
diff --git a/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java b/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java
index 1cdbbfb..d9a0649 100644
--- a/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java
+++ b/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java
@@ -31,7 +31,7 @@
 import android.text.Spanned;
 import android.text.style.URLSpan;
 import android.util.ArrayMap;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.voicemail.impl.ActivationTask;
 import com.android.voicemail.impl.Assert;
 import com.android.voicemail.impl.OmtpEvents;
diff --git a/java/com/android/voicemail/impl/res/xml/vvm_config.xml b/java/com/android/voicemail/impl/res/xml/vvm_config.xml
index b03115a..2bac66b 100644
--- a/java/com/android/voicemail/impl/res/xml/vvm_config.xml
+++ b/java/com/android/voicemail/impl/res/xml/vvm_config.xml
@@ -21,75 +21,6 @@
       <item value="TEST"/>
     </string-array>
   </pbundle_as_map>
-
-  <pbundle_as_map>
-    <!-- Orange Belgium -->
-    <string name="feature_flag_name">vvm_carrier_flag_20610</string>
-    <string-array name="mccmnc">
-      <item value="20610"/>
-    </string-array>
-
-    <int
-        name="vvm_port_number_int"
-        value="0"/>
-    <string name="vvm_destination_number_string">8082</string>
-    <string name="vvm_type_string">vvm_type_omtp</string>
-    <boolean
-        name="vvm_cellular_data_required_bool"
-        value="true"/>
-    <!-- Carrier VVM app com.orange.vvm only supports Orange FR-->
-    <string-array name="vvm_disabled_capabilities_string_array">
-      <!-- b/32365569 -->
-      <item value="STARTTLS"/>
-    </string-array>
-  </pbundle_as_map>
-
-  <pbundle_as_map>
-    <!-- Orange France -->
-    <string-array name="mccmnc">
-      <item value="20801"/>
-      <item value="20802"/>
-    </string-array>
-
-    <int
-      name="vvm_port_number_int"
-      value="20481"/>
-    <string name="vvm_destination_number_string">21101</string>
-    <string-array name="carrier_vvm_package_name_string_array">
-      <item value="com.orange.vvm"/>
-    </string-array>
-    <string name="vvm_type_string">vvm_type_omtp</string>
-    <boolean
-      name="vvm_cellular_data_required_bool"
-      value="true"/>
-    <string-array name="vvm_disabled_capabilities_string_array">
-      <!-- b/32365569 -->
-      <item value="STARTTLS"/>
-    </string-array>
-  </pbundle_as_map>
-
-  <pbundle_as_map>
-    <!-- Orange Luxembourg -->
-    <string name="feature_flag_name">vvm_carrier_flag_27099</string>
-    <string-array name="mccmnc">
-      <item value="27099"/>
-    </string-array>
-
-    <int
-        name="vvm_port_number_int"
-        value="0"/>
-    <string name="vvm_destination_number_string">64085</string>
-    <string name="vvm_type_string">vvm_type_omtp</string>
-    <boolean
-        name="vvm_cellular_data_required_bool"
-        value="true"/>
-    <!-- Carrier VVM app com.orange.vvm only supports Orange FR-->
-    <string-array name="vvm_disabled_capabilities_string_array">
-      <!-- b/32365569 -->
-      <item value="STARTTLS"/>
-    </string-array>
-  </pbundle_as_map>
-
   <pbundle_as_map>
     <!-- T-Mobile USA-->
     <string-array name="mccmnc">
diff --git a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java
index ac5f3ca..4860649 100644
--- a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java
+++ b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java
@@ -22,6 +22,7 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
+import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
@@ -29,7 +30,6 @@
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailComponent;
 import com.android.voicemail.impl.OmtpVvmCarrierConfigHelper;
@@ -43,8 +43,7 @@
  */
 @TargetApi(VERSION_CODES.O)
 public class VoicemailSettingsFragment extends PreferenceFragment
-    implements Preference.OnPreferenceChangeListener,
-        VvmAccountManager.Listener {
+    implements Preference.OnPreferenceChangeListener, VvmAccountManager.Listener {
 
   private static final String TAG = "VmSettingsActivity";
 
@@ -83,9 +82,8 @@
 
     voicemailNotificationPreference =
         findPreference(getString(R.string.voicemail_notifications_key));
-    voicemailNotificationPreference.setIntent(
-        NotificationChannelManager.getInstance()
-            .getSettingsIntentForChannel(getContext(), Channel.VOICEMAIL, phoneAccountHandle));
+    voicemailNotificationPreference.setIntent(getNotificationSettingsIntent());
+
     voicemailNotificationPreference.setOnPreferenceClickListener(
         new OnPreferenceClickListener() {
           @Override
@@ -233,4 +231,12 @@
       updateChangePin();
     }
   }
+
+  private Intent getNotificationSettingsIntent() {
+    String channelId =
+        NotificationChannelManager.getVoicemailChannelId(getContext(), phoneAccountHandle);
+    return new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+        .putExtra(Settings.EXTRA_CHANNEL_ID, channelId)
+        .putExtra(Settings.EXTRA_APP_PACKAGE, getContext().getPackageName());
+  }
 }
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java b/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java
index 17c9be7..0c83615 100644
--- a/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java
@@ -16,7 +16,7 @@
 package com.android.voicemail.impl.transcribe;
 
 import android.content.Context;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 
 /** Provides configuration values needed to connect to the transcription server. */
 public class TranscriptionConfigProvider {