Update AOSP Dialer source from internal google3 repository at

cl/150756069 Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/150392808 (3/16/2017) to cl/150756069 (3/21/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: I0888b5db52efb28eb8194600e0c7804592f975f3
author: Eric Erfanian <erfanian@google.com> 2017-03-21 10:11:17 -0700
committer: Eric Erfanian <erfanian@google.com> 2017-03-21 10:11:17 -0700
commit: fc37b02f5d3381a7882770941e461b13b679b6ef (patch)
tree: 23ce96100a89f1cf8847a4967efd35e56b6f8092
parent: 30ccc4f3aa6da94f0bb8a01a880a6353b883b263 (diff)
455 files changed, 6968 insertions, 2135 deletions
diff --git a/Android.mk b/Android.mk
index 83aedda6b..d21a1a5a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,8 +1,6 @@
 # Local modifications:
-# * b/36287059 Dagger classes have been manually crafted.
 # * b/31757757 Precompiled proto classes have been included.
 # * b/36215428 dialer/oem/res/values-mcc3* have been pruned
-# * b/36383971 StubCallLocationModule modified to return null.
 # * removed com.google.android.backup.api_key. This should be added to
 #      the manifest in the top level directory.
 # * removed com.google.android.geo.API_KEY key. This should be added to
@@ -31,10 +29,6 @@ SRC_DIRS := \
 
 # Exclude files incompatible with AOSP.
 EXCLUDE_FILES := \
-	$(BASE_DIR)/dialer/debug/bindings/impl/DebugBindings.java \
-	$(BASE_DIR)/dialer/debug/bindings/stub/DebugBindings.java \
-	$(BASE_DIR)/dialer/debug/impl/DebugConnection.java \
-	$(BASE_DIR)/dialer/debug/impl/DebugConnectionService.java \
 	$(BASE_DIR)/incallui/calllocation/impl/AuthException.java \
 	$(BASE_DIR)/incallui/calllocation/impl/CallLocationImpl.java \
 	$(BASE_DIR)/incallui/calllocation/impl/CallLocationModule.java \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index df9be677d..022cb174a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,7 +16,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   coreApp="true"
   package="com.android.dialer"
-  android:versionCode="100000"
+  android:versionCode="130000"
   android:versionName="10.0">
 
   <uses-sdk
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_24.png
new file mode 100644
index 000000000..9037f94e8
--- /dev/null
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_24.png
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_voicemail_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_voicemail_white_24.png
new file mode 100644
index 000000000..03a62e15f
--- /dev/null
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_voicemail_white_24.png
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_24.png
new file mode 100644
index 000000000..6c405f9ba
--- /dev/null
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_24.png
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_voicemail_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_voicemail_white_24.png
new file mode 100644
index 000000000..e5aa7db05
--- /dev/null
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_voicemail_white_24.png
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_24.png
new file mode 100644
index 000000000..0e89f6c74
--- /dev/null
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_24.png
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_voicemail_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_voicemail_white_24.png
new file mode 100644
index 000000000..59126d706
--- /dev/null
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_voicemail_white_24.png
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_24.png
new file mode 100644
index 000000000..175000510
--- /dev/null
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_24.png
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_voicemail_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_voicemail_white_24.png
new file mode 100644
index 000000000..28b8e936a
--- /dev/null
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_voicemail_white_24.png
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_24.png
new file mode 100644
index 000000000..eb4307aeb
--- /dev/null
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_24.png
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_voicemail_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_voicemail_white_24.png
new file mode 100644
index 000000000..820ff5066
--- /dev/null
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_voicemail_white_24.png
diff --git a/java/com/android/contacts/common/ContactPhotoManager.java b/java/com/android/contacts/common/ContactPhotoManager.java
index 0f65a6c56..9e627ae1f 100644
--- a/java/com/android/contacts/common/ContactPhotoManager.java
+++ b/java/com/android/contacts/common/ContactPhotoManager.java
@@ -27,7 +27,9 @@ import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.QuickContactBadge;
 import com.android.contacts.common.lettertiles.LetterTileDrawable;
+import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.util.PermissionsUtil;
 
@@ -233,6 +235,19 @@ public abstract class ContactPhotoManager implements ComponentCallbacks2 {
     loadThumbnail(view, photoId, darkTheme, isCircular, defaultImageRequest, DEFAULT_AVATAR);
   }
 
+  public final void loadDialerThumbnail(
+      QuickContactBadge badge, Uri contactUri, long photoId, String displayName, int contactType) {
+    badge.assignContactUri(contactUri);
+    badge.setOverlay(null);
+
+    String lookupKey = contactUri == null ? null : UriUtils.getLookupKeyFromUri(contactUri);
+    ContactPhotoManager.DefaultImageRequest request =
+        new ContactPhotoManager.DefaultImageRequest(
+            displayName, lookupKey, contactType, true /* isCircular */);
+    loadThumbnail(
+        badge, photoId, false /* darkTheme */, true /* isCircular */, request, DEFAULT_AVATAR);
+  }
+
   /**
    * Load photo into the supplied image view. If the photo is already cached, it is displayed
    * immediately. Otherwise a request is sent to load the photo from the location specified by the
diff --git a/java/com/android/contacts/common/dialog/CallSubjectDialog.java b/java/com/android/contacts/common/dialog/CallSubjectDialog.java
index d2e3a2357..5e0d6b58a 100644
--- a/java/com/android/contacts/common/dialog/CallSubjectDialog.java
+++ b/java/com/android/contacts/common/dialog/CallSubjectDialog.java
@@ -46,12 +46,10 @@ import android.widget.TextView;
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.R;
 import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
-import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.callintent.nano.CallInitiationType;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.util.ViewUtil;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -68,14 +66,13 @@ public class CallSubjectDialog extends Activity {
   /** Activity intent argument bundle keys: */
   public static final String ARG_PHOTO_ID = "PHOTO_ID";
 
-  public static final String ARG_PHOTO_URI = "PHOTO_URI";
   public static final String ARG_CONTACT_URI = "CONTACT_URI";
   public static final String ARG_NAME_OR_NUMBER = "NAME_OR_NUMBER";
-  public static final String ARG_IS_BUSINESS = "IS_BUSINESS";
   public static final String ARG_NUMBER = "NUMBER";
   public static final String ARG_DISPLAY_NUMBER = "DISPLAY_NUMBER";
   public static final String ARG_NUMBER_LABEL = "NUMBER_LABEL";
   public static final String ARG_PHONE_ACCOUNT_HANDLE = "PHONE_ACCOUNT_HANDLE";
+  public static final String ARG_CONTACT_TYPE = "CONTACT_TYPE";
   private static final int CALL_SUBJECT_LIMIT = 16;
   private static final int CALL_SUBJECT_HISTORY_SIZE = 5;
   private int mAnimationDuration;
@@ -111,7 +108,6 @@ public class CallSubjectDialog extends Activity {
         }
       };
 
-  private int mPhotoSize;
   private SharedPreferences mPrefs;
   private List<String> mSubjectHistory;
   /** Handles displaying the list of past call subjects. */
@@ -138,13 +134,12 @@ public class CallSubjectDialog extends Activity {
       };
 
   private long mPhotoID;
-  private Uri mPhotoUri;
   private Uri mContactUri;
   private String mNameOrNumber;
-  private boolean mIsBusiness;
   private String mNumber;
   private String mDisplayNumber;
   private String mNumberLabel;
+  private int mContactType;
   private PhoneAccountHandle mPhoneAccountHandle;
   /** Handles starting a call with a call subject specified. */
   private final View.OnClickListener mSendAndCallOnClickListener =
@@ -200,13 +195,12 @@ public class CallSubjectDialog extends Activity {
     start(
         activity,
         -1 /* photoId */,
-        null /* photoUri */,
         null /* contactUri */,
         number /* nameOrNumber */,
-        false /* isBusiness */,
         number /* number */,
         null /* displayNumber */,
         null /* numberLabel */,
+        ContactPhotoManager.TYPE_DEFAULT,
         null /* phoneAccountHandle */);
   }
 
@@ -215,35 +209,32 @@ public class CallSubjectDialog extends Activity {
    *
    * @param activity The current activity.
    * @param photoId The photo ID (used to populate contact photo).
-   * @param photoUri The photo Uri (used to populate contact photo).
    * @param contactUri The Contact URI (used so quick contact can be invoked from contact photo).
    * @param nameOrNumber The name or number of the callee.
-   * @param isBusiness {@code true} if a business is being called (used for contact photo).
    * @param number The raw number to dial.
    * @param displayNumber The number to dial, formatted for display.
    * @param numberLabel The label for the number (if from a contact).
+   * @param contactType The contact type according to {@link ContactPhotoManager}.
    * @param phoneAccountHandle The phone account handle.
    */
   public static void start(
       Activity activity,
       long photoId,
-      Uri photoUri,
       Uri contactUri,
       String nameOrNumber,
-      boolean isBusiness,
       String number,
       String displayNumber,
       String numberLabel,
+      int contactType,
       PhoneAccountHandle phoneAccountHandle) {
     Bundle arguments = new Bundle();
     arguments.putLong(ARG_PHOTO_ID, photoId);
-    arguments.putParcelable(ARG_PHOTO_URI, photoUri);
     arguments.putParcelable(ARG_CONTACT_URI, contactUri);
     arguments.putString(ARG_NAME_OR_NUMBER, nameOrNumber);
-    arguments.putBoolean(ARG_IS_BUSINESS, isBusiness);
     arguments.putString(ARG_NUMBER, number);
     arguments.putString(ARG_DISPLAY_NUMBER, displayNumber);
     arguments.putString(ARG_NUMBER_LABEL, numberLabel);
+    arguments.putInt(ARG_CONTACT_TYPE, contactType);
     arguments.putParcelable(ARG_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
     start(activity, arguments);
   }
@@ -293,8 +284,6 @@ public class CallSubjectDialog extends Activity {
     super.onCreate(savedInstanceState);
     mAnimationDuration = getResources().getInteger(R.integer.call_subject_animation_duration);
     mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-    mPhotoSize =
-        getResources().getDimensionPixelSize(R.dimen.call_subject_dialog_contact_photo_size);
     readArguments();
     loadConfiguration();
     mSubjectHistory = loadSubjectHistory(mPrefs);
@@ -330,7 +319,8 @@ public class CallSubjectDialog extends Activity {
   /** Populates the contact info fields based on the current contact information. */
   private void updateContactInfo() {
     if (mContactUri != null) {
-      setPhoto(mPhotoID, mPhotoUri, mContactUri, mNameOrNumber, mIsBusiness);
+      ContactPhotoManager.getInstance(this)
+          .loadDialerThumbnail(mContactPhoto, mContactUri, mPhotoID, mNameOrNumber, mContactType);
     } else {
       mContactPhoto.setVisibility(View.GONE);
     }
@@ -353,13 +343,12 @@ public class CallSubjectDialog extends Activity {
       return;
     }
     mPhotoID = arguments.getLong(ARG_PHOTO_ID);
-    mPhotoUri = arguments.getParcelable(ARG_PHOTO_URI);
     mContactUri = arguments.getParcelable(ARG_CONTACT_URI);
     mNameOrNumber = arguments.getString(ARG_NAME_OR_NUMBER);
-    mIsBusiness = arguments.getBoolean(ARG_IS_BUSINESS);
     mNumber = arguments.getString(ARG_NUMBER);
     mDisplayNumber = arguments.getString(ARG_DISPLAY_NUMBER);
     mNumberLabel = arguments.getString(ARG_NUMBER_LABEL);
+    mContactType = arguments.getInt(ARG_CONTACT_TYPE, ContactPhotoManager.TYPE_DEFAULT);
     mPhoneAccountHandle = arguments.getParcelable(ARG_PHONE_ACCOUNT_HANDLE);
   }
 
@@ -389,46 +378,6 @@ public class CallSubjectDialog extends Activity {
     }
   }
 
-  /** Sets the photo on the quick contact photo. */
-  private void setPhoto(
-      long photoId, Uri photoUri, Uri contactUri, String displayName, boolean isBusiness) {
-    mContactPhoto.assignContactUri(contactUri);
-    if (CompatUtils.isLollipopCompatible()) {
-      mContactPhoto.setOverlay(null);
-    }
-
-    int contactType;
-    if (isBusiness) {
-      contactType = ContactPhotoManager.TYPE_BUSINESS;
-    } else {
-      contactType = ContactPhotoManager.TYPE_DEFAULT;
-    }
-
-    String lookupKey = null;
-    if (contactUri != null) {
-      lookupKey = UriUtils.getLookupKeyFromUri(contactUri);
-    }
-
-    ContactPhotoManager.DefaultImageRequest request =
-        new ContactPhotoManager.DefaultImageRequest(
-            displayName, lookupKey, contactType, true /* isCircular */);
-
-    if (photoId == 0 && photoUri != null) {
-      ContactPhotoManager.getInstance(this)
-          .loadPhoto(
-              mContactPhoto,
-              photoUri,
-              mPhotoSize,
-              false /* darkTheme */,
-              true /* isCircular */,
-              request);
-    } else {
-      ContactPhotoManager.getInstance(this)
-          .loadThumbnail(
-              mContactPhoto, photoId, false /* darkTheme */, true /* isCircular */, request);
-    }
-  }
-
   /**
    * Saves the subject history list to shared prefs, removing older items so that there are only
    * {@link #CALL_SUBJECT_HISTORY_SIZE} items at most.
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_person_add_24dp.png
deleted file mode 100644
index 10ae5a70c..000000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_person_add_24dp.png
+++ /dev/null
diff --git a/java/com/android/contacts/common/res/drawable-mdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-mdpi/ic_person_add_24dp.png
deleted file mode 100644
index 38e0a2882..000000000
--- a/java/com/android/contacts/common/res/drawable-mdpi/ic_person_add_24dp.png
+++ /dev/null
diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-xhdpi/ic_person_add_24dp.png
deleted file mode 100644
index 7e7c289d4..000000000
--- a/java/com/android/contacts/common/res/drawable-xhdpi/ic_person_add_24dp.png
+++ /dev/null
diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-xxhdpi/ic_person_add_24dp.png
deleted file mode 100644
index 8f744f039..000000000
--- a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_person_add_24dp.png
+++ /dev/null
diff --git a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_person_add_24dp.png
deleted file mode 100644
index 2fa2cca80..000000000
--- a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_person_add_24dp.png
+++ /dev/null
diff --git a/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml b/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml
index 0af90edb3..c2538cfd1 100644
--- a/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml
+++ b/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml
@@ -16,5 +16,5 @@
   -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
   android:autoMirrored="true"
-  android:src="@drawable/ic_person_add_24dp"
+  android:src="@drawable/quantum_ic_person_add_white_24"
   android:tint="@color/actionbar_icon_color"/>
diff --git a/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml b/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml
index 801806044..476212d24 100644
--- a/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml
+++ b/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml
@@ -17,4 +17,4 @@
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
   android:autoMirrored="true"
-  android:src="@drawable/ic_person_add_24dp"/>
+  android:src="@drawable/quantum_ic_person_add_white_24"/>
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 55a210a0b..ed081ec60 100644
--- a/java/com/android/contacts/common/res/values-ky/strings.xml
+++ b/java/com/android/contacts/common/res/values-ky/strings.xml
@@ -122,7 +122,7 @@
     <string name="email_mobile" msgid="4487686436743741150">"Мобилге эмейлдөө"</string>
     <string name="email_work" msgid="4223487303344613528">"Жумушка эмейлдөө"</string>
     <string name="email_other" msgid="4246411900126012062">"Электрондук кат жазуу"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> эмейл жөнөтүү"</string>
+    <string name="email_custom" msgid="7246580894327511013">"Кат жазуу (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
     <string name="email" msgid="2807318537887091606">"Электрондук кат жазуу"</string>
     <string name="postal_street" msgid="6918171741240802474">"Көчөсү"</string>
     <string name="postal_pobox" msgid="2962203483168878561">"Абонент кутусу"</string>
diff --git a/java/com/android/contacts/common/util/FabUtil.java b/java/com/android/contacts/common/util/FabUtil.java
deleted file mode 100644
index b1bb2e653..000000000
--- a/java/com/android/contacts/common/util/FabUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.contacts.common.util;
-
-import android.content.res.Resources;
-import android.graphics.Outline;
-import android.view.View;
-import android.view.ViewOutlineProvider;
-import android.widget.ListView;
-import com.android.contacts.common.R;
-import com.android.dialer.compat.CompatUtils;
-
-/** Provides static functions to work with views */
-public class FabUtil {
-
-  private static final ViewOutlineProvider OVAL_OUTLINE_PROVIDER =
-      new ViewOutlineProvider() {
-        @Override
-        public void getOutline(View view, Outline outline) {
-          outline.setOval(0, 0, view.getWidth(), view.getHeight());
-        }
-      };
-
-  private FabUtil() {}
-
-  /**
-   * Configures the floating action button, clipping it to a circle and setting its translation z
-   *
-   * @param fabView the float action button's view
-   * @param res the resources file
-   */
-  public static void setupFloatingActionButton(View fabView, Resources res) {
-    if (CompatUtils.isLollipopCompatible()) {
-      fabView.setOutlineProvider(OVAL_OUTLINE_PROVIDER);
-      fabView.setTranslationZ(
-          res.getDimensionPixelSize(R.dimen.floating_action_button_translation_z));
-    }
-  }
-
-  /**
-   * Adds padding to the bottom of the given {@link ListView} so that the floating action button
-   * does not obscure any content.
-   *
-   * @param listView to add the padding to
-   * @param res valid resources object
-   */
-  public static void addBottomPaddingToListViewForFab(ListView listView, Resources res) {
-    final int fabPadding =
-        res.getDimensionPixelSize(R.dimen.floating_action_button_list_bottom_padding);
-    listView.setPaddingRelative(
-        listView.getPaddingStart(),
-        listView.getPaddingTop(),
-        listView.getPaddingEnd(),
-        listView.getPaddingBottom() + fabPadding);
-    listView.setClipToPadding(false);
-  }
-}
diff --git a/java/com/android/contacts/common/widget/FloatingActionButtonController.java b/java/com/android/contacts/common/widget/FloatingActionButtonController.java
index f03129779..368d09207 100644
--- a/java/com/android/contacts/common/widget/FloatingActionButtonController.java
+++ b/java/com/android/contacts/common/widget/FloatingActionButtonController.java
@@ -19,13 +19,13 @@ package com.android.contacts.common.widget;
 import android.app.Activity;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.support.design.widget.FloatingActionButton;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
-import android.widget.ImageButton;
 import com.android.contacts.common.R;
-import com.android.contacts.common.util.FabUtil;
 import com.android.dialer.animation.AnimUtils;
+import com.android.dialer.common.Assert;
 
 /** Controls the movement and appearance of the FAB (Floating Action Button). */
 public class FloatingActionButtonController {
@@ -41,12 +41,11 @@ public class FloatingActionButtonController {
   private final int mAnimationDuration;
   private final int mFloatingActionButtonWidth;
   private final int mFloatingActionButtonMarginRight;
-  private final View mFloatingActionButtonContainer;
-  private final ImageButton mFloatingActionButton;
+  private final FloatingActionButton mFab;
   private final Interpolator mFabInterpolator;
   private int mScreenWidth;
 
-  public FloatingActionButtonController(Activity activity, View container, ImageButton button) {
+  public FloatingActionButtonController(Activity activity, FloatingActionButton fab) {
     Resources resources = activity.getResources();
     mFabInterpolator =
         AnimationUtils.loadInterpolator(activity, android.R.interpolator.fast_out_slow_in);
@@ -55,9 +54,7 @@ public class FloatingActionButtonController {
     mFloatingActionButtonMarginRight =
         resources.getDimensionPixelOffset(R.dimen.floating_action_button_margin_right);
     mAnimationDuration = resources.getInteger(R.integer.floating_action_button_animation_duration);
-    mFloatingActionButtonContainer = container;
-    mFloatingActionButton = button;
-    FabUtil.setupFloatingActionButton(mFloatingActionButtonContainer, resources);
+    mFab = fab;
   }
 
   /**
@@ -71,7 +68,7 @@ public class FloatingActionButtonController {
   }
 
   public boolean isVisible() {
-    return mFloatingActionButtonContainer.getVisibility() == View.VISIBLE;
+    return mFab.getVisibility() == View.VISIBLE;
   }
 
   /**
@@ -80,14 +77,13 @@ public class FloatingActionButtonController {
    * @param visible Whether or not to make the container visible.
    */
   public void setVisible(boolean visible) {
-    mFloatingActionButtonContainer.setVisibility(visible ? View.VISIBLE : View.GONE);
+    mFab.setVisibility(visible ? View.VISIBLE : View.GONE);
   }
 
   public void changeIcon(Drawable icon, String description) {
-    if (mFloatingActionButton.getDrawable() != icon
-        || !mFloatingActionButton.getContentDescription().equals(description)) {
-      mFloatingActionButton.setImageDrawable(icon);
-      mFloatingActionButton.setContentDescription(description);
+    if (mFab.getDrawable() != icon || !mFab.getContentDescription().equals(description)) {
+      mFab.setImageDrawable(icon);
+      mFab.setContentDescription(description);
     }
   }
 
@@ -99,8 +95,7 @@ public class FloatingActionButtonController {
   public void onPageScrolled(float positionOffset) {
     // As the page is scrolling, if we're on the first tab, update the FAB position so it
     // moves along with it.
-    mFloatingActionButtonContainer.setTranslationX(
-        (int) (positionOffset * getTranslationXForAlignment(ALIGN_END)));
+    mFab.setTranslationX(positionOffset * getTranslationXForAlignment(ALIGN_END));
   }
 
   /**
@@ -121,7 +116,7 @@ public class FloatingActionButtonController {
    * @param offsetY Additional offsetY to translate by.
    * @param animate Whether or not to animate the transition.
    */
-  public void align(int align, int offsetX, int offsetY, boolean animate) {
+  private void align(int align, int offsetX, int offsetY, boolean animate) {
     if (mScreenWidth == 0) {
       return;
     }
@@ -129,33 +124,16 @@ public class FloatingActionButtonController {
     int translationX = getTranslationXForAlignment(align);
 
     // Skip animation if container is not shown; animation causes container to show again.
-    if (animate && mFloatingActionButtonContainer.isShown()) {
-      mFloatingActionButtonContainer
-          .animate()
+    if (animate && mFab.isShown()) {
+      mFab.animate()
           .translationX(translationX + offsetX)
           .translationY(offsetY)
           .setInterpolator(mFabInterpolator)
           .setDuration(mAnimationDuration)
           .start();
     } else {
-      mFloatingActionButtonContainer.setTranslationX(translationX + offsetX);
-      mFloatingActionButtonContainer.setTranslationY(offsetY);
-    }
-  }
-
-  /**
-   * Resizes width and height of the floating action bar container.
-   *
-   * @param dimension The new dimensions for the width and height.
-   * @param animate Whether to animate this change.
-   */
-  public void resize(int dimension, boolean animate) {
-    if (animate) {
-      AnimUtils.changeDimensions(mFloatingActionButtonContainer, dimension, dimension);
-    } else {
-      mFloatingActionButtonContainer.getLayoutParams().width = dimension;
-      mFloatingActionButtonContainer.getLayoutParams().height = dimension;
-      mFloatingActionButtonContainer.requestLayout();
+      mFab.setTranslationX(translationX + offsetX);
+      mFab.setTranslationY(offsetY);
     }
   }
 
@@ -167,17 +145,8 @@ public class FloatingActionButtonController {
    */
   public void scaleIn(int delayMs) {
     setVisible(true);
-    AnimUtils.scaleIn(mFloatingActionButtonContainer, FAB_SCALE_IN_DURATION, delayMs);
-    AnimUtils.fadeIn(
-        mFloatingActionButton, FAB_SCALE_IN_DURATION, delayMs + FAB_SCALE_IN_FADE_IN_DELAY, null);
-  }
-
-  /** Immediately remove the affects of the last call to {@link #scaleOut}. */
-  public void resetIn() {
-    mFloatingActionButton.setAlpha(1f);
-    mFloatingActionButton.setVisibility(View.VISIBLE);
-    mFloatingActionButtonContainer.setScaleX(1);
-    mFloatingActionButtonContainer.setScaleY(1);
+    AnimUtils.scaleIn(mFab, FAB_SCALE_IN_DURATION, delayMs);
+    AnimUtils.fadeIn(mFab, FAB_SCALE_IN_DURATION, delayMs + FAB_SCALE_IN_FADE_IN_DELAY, null);
   }
 
   /**
@@ -185,10 +154,10 @@ public class FloatingActionButtonController {
    * animation for hiding the floating action button.
    */
   public void scaleOut() {
-    AnimUtils.scaleOut(mFloatingActionButtonContainer, mAnimationDuration);
+    AnimUtils.scaleOut(mFab, mAnimationDuration);
     // Fade out the icon faster than the scale out animation, so that the icon scaling is less
     // obvious. We don't want it to scale, but the resizing the container is not as performant.
-    AnimUtils.fadeOut(mFloatingActionButton, FAB_ICON_FADE_OUT_DURATION, null);
+    AnimUtils.fadeOut(mFab, FAB_ICON_FADE_OUT_DURATION, null);
   }
 
   /**
@@ -198,8 +167,8 @@ public class FloatingActionButtonController {
    * @param align One of ALIGN_MIDDLE, ALIGN_QUARTER_RIGHT, or ALIGN_RIGHT.
    * @return The translationX for the given alignment.
    */
-  public int getTranslationXForAlignment(int align) {
-    int result = 0;
+  private int getTranslationXForAlignment(int align) {
+    int result;
     switch (align) {
       case ALIGN_MIDDLE:
         // Moves the FAB to exactly center screen.
@@ -213,6 +182,8 @@ public class FloatingActionButtonController {
         result =
             mScreenWidth / 2 - mFloatingActionButtonWidth / 2 - mFloatingActionButtonMarginRight;
         break;
+      default:
+        throw Assert.createIllegalStateFailException("Invalid alignment value: " + align);
     }
     if (isLayoutRtl()) {
       result *= -1;
@@ -221,6 +192,6 @@ public class FloatingActionButtonController {
   }
 
   private boolean isLayoutRtl() {
-    return mFloatingActionButtonContainer.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
+    return mFab.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
   }
 }
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index 96942a72c..09979ebf9 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -35,6 +35,7 @@ import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.view.ViewPager;
@@ -51,7 +52,6 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnDragListener;
-import android.view.ViewTreeObserver;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.AbsListView.OnScrollListener;
@@ -392,12 +392,11 @@ public class DialtactsActivity extends TransactionSafeActivity
     mIsLandscape =
         getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
     mPreviouslySelectedTabIndex = ListsFragment.TAB_INDEX_SPEED_DIAL;
-    final View floatingActionButtonContainer = findViewById(R.id.floating_action_button_container);
-    ImageButton floatingActionButton = (ImageButton) findViewById(R.id.floating_action_button);
+    FloatingActionButton floatingActionButton =
+        (FloatingActionButton) findViewById(R.id.floating_action_button);
     floatingActionButton.setOnClickListener(this);
     mFloatingActionButtonController =
-        new FloatingActionButtonController(
-            this, floatingActionButtonContainer, floatingActionButton);
+        new FloatingActionButtonController(this, floatingActionButton);
 
     ImageButton optionsMenuButton =
         (ImageButton) searchEditTextLayout.findViewById(R.id.dialtacts_options_menu_button);
@@ -443,23 +442,13 @@ public class DialtactsActivity extends TransactionSafeActivity
 
     mParentLayout = (CoordinatorLayout) findViewById(R.id.dialtacts_mainlayout);
     mParentLayout.setOnDragListener(new LayoutOnDragListener());
-    floatingActionButtonContainer
-        .getViewTreeObserver()
-        .addOnGlobalLayoutListener(
-            new ViewTreeObserver.OnGlobalLayoutListener() {
-              @Override
-              public void onGlobalLayout() {
-                final ViewTreeObserver observer =
-                    floatingActionButtonContainer.getViewTreeObserver();
-                if (!observer.isAlive()) {
-                  return;
-                }
-                observer.removeOnGlobalLayoutListener(this);
-                int screenWidth = mParentLayout.getWidth();
-                mFloatingActionButtonController.setScreenWidth(screenWidth);
-                mFloatingActionButtonController.align(getFabAlignment(), false /* animate */);
-              }
-            });
+    ViewUtil.doOnGlobalLayout(
+        floatingActionButton,
+        view -> {
+          int screenWidth = mParentLayout.getWidth();
+          mFloatingActionButtonController.setScreenWidth(screenWidth);
+          mFloatingActionButtonController.align(getFabAlignment(), false /* animate */);
+        });
 
     Trace.endSection();
 
@@ -1179,7 +1168,7 @@ public class DialtactsActivity extends TransactionSafeActivity
 
   private void showFabInSearchUi() {
     mFloatingActionButtonController.changeIcon(
-        getResources().getDrawable(R.drawable.fab_ic_dial, null),
+        getResources().getDrawable(R.drawable.quantum_ic_dialpad_white_24, null),
         getResources().getString(R.string.action_menu_dialpad_button));
     mFloatingActionButtonController.align(getFabAlignment(), false /* animate */);
     mFloatingActionButtonController.scaleIn(FAB_SCALE_IN_DELAY_MS);
@@ -1364,11 +1353,11 @@ public class DialtactsActivity extends TransactionSafeActivity
         && !mInRegularSearch
         && !mInDialpadSearch) {
       mFloatingActionButtonController.changeIcon(
-          getResources().getDrawable(R.drawable.ic_person_add_24dp, null),
+          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.fab_ic_dial, null),
+          getResources().getDrawable(R.drawable.quantum_ic_dialpad_white_24, null),
           getResources().getString(R.string.action_menu_dialpad_button));
     }
   }
diff --git a/java/com/android/dialer/app/FloatingActionButtonBehavior.java b/java/com/android/dialer/app/FloatingActionButtonBehavior.java
deleted file mode 100644
index d4a79ca19..000000000
--- a/java/com/android/dialer/app/FloatingActionButtonBehavior.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-package com.android.dialer.app;
-
-import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar.SnackbarLayout;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.FrameLayout;
-import com.android.dialer.proguard.UsedByReflection;
-
-/**
- * Implements custom behavior for the movement of the FAB in response to the Snackbar. Because we
- * are not using the design framework FloatingActionButton widget, we need to manually implement the
- * Material Design behavior of having the FAB translate upward and downward with the appearance and
- * disappearance of a Snackbar.
- */
-@UsedByReflection(value = "dialtacts_activity.xml")
-public class FloatingActionButtonBehavior extends CoordinatorLayout.Behavior<FrameLayout> {
-
-  @UsedByReflection(value = "dialtacts_activity.xml")
-  public FloatingActionButtonBehavior(Context context, AttributeSet attrs) {}
-
-  @Override
-  public boolean layoutDependsOn(CoordinatorLayout parent, FrameLayout child, View dependency) {
-    return dependency instanceof SnackbarLayout;
-  }
-
-  @Override
-  public boolean onDependentViewChanged(
-      CoordinatorLayout parent, FrameLayout child, View dependency) {
-    float translationY = Math.min(0, dependency.getTranslationY() - dependency.getHeight());
-    child.setTranslationY(translationY);
-    return true;
-  }
-}
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index fc5ffbb29..8d84e8ea7 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -65,7 +65,6 @@ import com.android.dialer.common.LogUtil;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.enrichedcall.EnrichedCallManager.CapabilitiesListener;
 import com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.nano.DialerImpression;
@@ -81,7 +80,7 @@ import java.util.Set;
 
 /** Adapter class to fill in data for the Call Log. */
 public class CallLogAdapter extends GroupingListAdapter
-    implements GroupCreator, OnVoicemailDeletedListener, CapabilitiesListener {
+    implements GroupCreator, OnVoicemailDeletedListener {
 
   // Types of activities the call log adapter is used for
   public static final int ACTIVITY_TYPE_CALL_LOG = 1;
@@ -134,6 +133,14 @@ public class CallLogAdapter extends GroupingListAdapter
             mVoicemailPlaybackPresenter.resetAll();
           }
 
+          // If enriched call capabilities were unknown on the initial load,
+          // viewHolder.isCallComposerCapable may be unset. Check here if we have the capabilities
+          // as a last attempt at getting them before showing the expanded view to the user
+          EnrichedCallCapabilities capabilities =
+              getEnrichedCallManager().getCapabilities(viewHolder.number);
+          viewHolder.isCallComposerCapable =
+              capabilities != null && capabilities.supportsCallComposer();
+
           if (viewHolder.rowId == mCurrentlyExpandedRowId) {
             // Hide actions, if the clicked item is the expanded item.
             viewHolder.showActions(false);
@@ -300,7 +307,6 @@ public class CallLogAdapter extends GroupingListAdapter
     }
     mContactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY);
     mIsSpamEnabled = Spam.get(mActivity).isSpamEnabled();
-    getEnrichedCallManager().registerCapabilitiesListener(this);
     notifyDataSetChanged();
   }
 
@@ -309,7 +315,6 @@ public class CallLogAdapter extends GroupingListAdapter
     for (Uri uri : mHiddenItemUris) {
       CallLogAsyncTaskUtil.deleteVoicemail(mActivity, uri, null);
     }
-    getEnrichedCallManager().unregisterCapabilitiesListener(this);
   }
 
   public void onStop() {
@@ -451,8 +456,11 @@ public class CallLogAdapter extends GroupingListAdapter
     views.isSpam = false;
     views.blockId = null;
     views.isSpamFeatureEnabled = false;
-    views.isCallComposerCapable =
-        isCallComposerCapable(PhoneNumberUtils.formatNumberToE164(views.number, views.countryIso));
+
+    // Attempt to set the isCallComposerCapable field. If capabilities are unknown for this number,
+    // the value will be false while capabilities are requested. mExpandCollapseListener will
+    // attempt to set the field properly in that case
+    views.isCallComposerCapable = isCallComposerCapable(views.number);
     final AsyncTask<Void, Void, Boolean> loadDataTask =
         new AsyncTask<Void, Void, Boolean>() {
           @Override
@@ -524,14 +532,14 @@ public class CallLogAdapter extends GroupingListAdapter
   }
 
   @MainThread
-  private boolean isCallComposerCapable(@Nullable String e164Number) {
-    if (e164Number == null) {
+  private boolean isCallComposerCapable(@Nullable String number) {
+    if (number == null) {
       return false;
     }
 
-    EnrichedCallCapabilities capabilities = getEnrichedCallManager().getCapabilities(e164Number);
+    EnrichedCallCapabilities capabilities = getEnrichedCallManager().getCapabilities(number);
     if (capabilities == null) {
-      getEnrichedCallManager().requestCapabilities(e164Number);
+      getEnrichedCallManager().requestCapabilities(number);
       return false;
     }
     return capabilities.supportsCallComposer();
@@ -953,11 +961,6 @@ public class CallLogAdapter extends GroupingListAdapter
     }
   }
 
-  @Override
-  public void onCapabilitiesUpdated() {
-    notifyDataSetChanged();
-  }
-
   @NonNull
   private EnrichedCallManager getEnrichedCallManager() {
     return EnrichedCallComponent.get(mActivity).getEnrichedCallManager();
diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
index 89ed95c0b..6a3187fa8 100644
--- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
+++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
@@ -769,21 +769,12 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
       quickContactView.setImageDrawable(mContext.getDrawable(R.drawable.blocked_contact));
       return;
     }
-    final boolean isVoicemail = mCallLogCache.isVoicemailNumber(accountHandle, number);
-    int contactType = ContactPhotoManager.TYPE_DEFAULT;
-    if (isVoicemail) {
-      contactType = ContactPhotoManager.TYPE_VOICEMAIL;
-    } else if (isBusiness) {
-      contactType = ContactPhotoManager.TYPE_BUSINESS;
-    } else if (numberPresentation == TelecomManager.PRESENTATION_RESTRICTED) {
-      contactType = ContactPhotoManager.TYPE_GENERIC_AVATAR;
-    }
 
     final String lookupKey =
         info.lookupUri != null ? UriUtils.getLookupKeyFromUri(info.lookupUri) : null;
     final String displayName = TextUtils.isEmpty(info.name) ? displayNumber : info.name;
     final DefaultImageRequest request =
-        new DefaultImageRequest(displayName, lookupKey, contactType, true /* isCircular */);
+        new DefaultImageRequest(displayName, lookupKey, getContactType(), true /* isCircular */);
 
     if (info.photoId == 0 && info.photoUri != null) {
       ContactPhotoManager.getInstance(mContext)
@@ -805,6 +796,18 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
     }
   }
 
+  private int getContactType() {
+    int contactType = ContactPhotoManager.TYPE_DEFAULT;
+    if (mCallLogCache.isVoicemailNumber(accountHandle, number)) {
+      contactType = ContactPhotoManager.TYPE_VOICEMAIL;
+    } else if (isBusiness) {
+      contactType = ContactPhotoManager.TYPE_BUSINESS;
+    } else if (numberPresentation == TelecomManager.PRESENTATION_RESTRICTED) {
+      contactType = ContactPhotoManager.TYPE_GENERIC_AVATAR;
+    }
+    return contactType;
+  }
+
   @Override
   public void onClick(View view) {
     if (view.getId() == R.id.primary_action_button && !TextUtils.isEmpty(voicemailUri)) {
@@ -815,14 +818,13 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
       CallSubjectDialog.start(
           (Activity) mContext,
           info.photoId,
-          info.photoUri,
           info.lookupUri,
           (String) nameOrNumber /* top line of contact view in call subject dialog */,
-          isBusiness,
           number,
           TextUtils.isEmpty(info.name) ? null : displayNumber, /* second line of contact
                                                                            view in dialog. */
           numberType, /* phone number type (e.g. mobile) in second line of contact view */
+          getContactType(),
           accountHandle);
     } else if (view.getId() == R.id.block_report_action) {
       Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_BLOCK_REPORT_SPAM);
@@ -881,7 +883,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
     contact.photoUri = info.photoUri == null ? null : info.photoUri.toString();
     contact.contactUri = info.lookupUri == null ? null : info.lookupUri.toString();
     contact.nameOrNumber = (String) nameOrNumber;
-    contact.isBusiness = isBusiness;
+    contact.contactType = getContactType();
     contact.number = number;
     /* second line of contact view. */
     contact.displayNumber = TextUtils.isEmpty(info.name) ? null : displayNumber;
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
index cace57518..edbe5c6ed 100644
--- a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
@@ -17,6 +17,7 @@
 package com.android.dialer.app.calllog;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.database.ContentObserver;
 import android.media.AudioManager;
 import android.os.Bundle;
@@ -122,6 +123,7 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment {
     LogUtil.d("VisualVoicemailCallLogFragment.onPageResume", null);
     super.onPageResume(activity);
     if (activity != null) {
+      activity.sendBroadcast(new Intent(VoicemailContract.ACTION_SYNC_VOICEMAIL));
       Logger.get(activity).logImpression(DialerImpression.Type.VVM_TAB_VIEWED);
       activity.setVolumeControlStream(VoicemailAudioManager.PLAYBACK_STREAM);
     }
diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java
index 4785ab16f..80be8fe05 100644
--- a/java/com/android/dialer/app/dialpad/DialpadFragment.java
+++ b/java/com/android/dialer/app/dialpad/DialpadFragment.java
@@ -42,6 +42,7 @@ import android.provider.Contacts.Phones;
 import android.provider.Contacts.PhonesColumns;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.content.ContextCompat;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
@@ -63,7 +64,6 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.PopupMenu;
@@ -405,14 +405,11 @@ public class DialpadFragment extends Fragment
     mDialpadChooser = (ListView) fragmentView.findViewById(R.id.dialpadChooser);
     mDialpadChooser.setOnItemClickListener(this);
 
-    final View floatingActionButtonContainer =
-        fragmentView.findViewById(R.id.dialpad_floating_action_button_container);
-    final ImageButton floatingActionButton =
-        (ImageButton) fragmentView.findViewById(R.id.dialpad_floating_action_button);
+    FloatingActionButton floatingActionButton =
+        (FloatingActionButton) fragmentView.findViewById(R.id.dialpad_floating_action_button);
     floatingActionButton.setOnClickListener(this);
     mFloatingActionButtonController =
-        new FloatingActionButtonController(
-            getActivity(), floatingActionButtonContainer, floatingActionButton);
+        new FloatingActionButtonController(getActivity(), floatingActionButton);
     Trace.endSection();
     Trace.endSection();
     return fragmentView;
diff --git a/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java b/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java
index 2ffacb6d8..be2964dfe 100644
--- a/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java
+++ b/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java
@@ -65,7 +65,7 @@ public class PseudoEmergencyAnimator {
                 ColorFilter colorFilter = new LightingColorFilter(Color.BLACK, color);
 
                 View floatingActionButtonContainer =
-                    getView().findViewById(R.id.dialpad_floating_action_button_container);
+                    getView().findViewById(R.id.floating_action_button);
                 if (floatingActionButtonContainer != null) {
                   floatingActionButtonContainer.getBackground().setColorFilter(colorFilter);
                 }
@@ -96,7 +96,7 @@ public class PseudoEmergencyAnimator {
             public void onAnimationEnd(Animator animation) {
               try {
                 View floatingActionButtonContainer =
-                    getView().findViewById(R.id.dialpad_floating_action_button_container);
+                    getView().findViewById(R.id.floating_action_button);
                 if (floatingActionButtonContainer != null) {
                   floatingActionButtonContainer.getBackground().clearColorFilter();
                 }
diff --git a/java/com/android/dialer/app/list/AllContactsFragment.java b/java/com/android/dialer/app/list/AllContactsFragment.java
index 093e8f384..29c0ec47f 100644
--- a/java/com/android/dialer/app/list/AllContactsFragment.java
+++ b/java/com/android/dialer/app/list/AllContactsFragment.java
@@ -38,7 +38,6 @@ import com.android.contacts.common.list.ContactEntryListAdapter;
 import com.android.contacts.common.list.ContactEntryListFragment;
 import com.android.contacts.common.list.ContactListFilter;
 import com.android.contacts.common.list.DefaultContactListAdapter;
-import com.android.contacts.common.util.FabUtil;
 import com.android.dialer.app.R;
 import com.android.dialer.app.list.ListsFragment.ListsPage;
 import com.android.dialer.app.widget.EmptyContentView;
@@ -90,8 +89,6 @@ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryLi
     mEmptyListView.setActionClickedListener(this);
     getListView().setEmptyView(mEmptyListView);
     mEmptyListView.setVisibility(View.GONE);
-
-    FabUtil.addBottomPaddingToListViewForFab(getListView(), getResources());
   }
 
   @Override
diff --git a/java/com/android/dialer/app/list/ListsFragment.java b/java/com/android/dialer/app/list/ListsFragment.java
index e4206d41d..3b94e1562 100644
--- a/java/com/android/dialer/app/list/ListsFragment.java
+++ b/java/com/android/dialer/app/list/ListsFragment.java
@@ -48,7 +48,6 @@ import com.android.dialer.logging.nano.ScreenEvent;
 import com.android.dialer.util.ViewUtil;
 import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;
 import com.android.dialer.voicemailstatus.VoicemailStatusHelper;
-import com.android.dialer.voicemailstatus.VoicemailStatusHelperImpl;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -127,7 +126,7 @@ public class ListsFragment extends Fragment
     Trace.beginSection(TAG + " onCreate");
     super.onCreate(savedInstanceState);
 
-    mVoicemailStatusHelper = new VoicemailStatusHelperImpl();
+    mVoicemailStatusHelper = new VoicemailStatusHelper();
     mHasFetchedVoicemailStatus = false;
 
     mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
diff --git a/java/com/android/dialer/app/list/SearchFragment.java b/java/com/android/dialer/app/list/SearchFragment.java
index e6615aa8d..4128300df 100644
--- a/java/com/android/dialer/app/list/SearchFragment.java
+++ b/java/com/android/dialer/app/list/SearchFragment.java
@@ -23,7 +23,6 @@ import android.app.DialogFragment;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -38,7 +37,6 @@ import com.android.contacts.common.list.ContactEntryListAdapter;
 import com.android.contacts.common.list.ContactListItemView;
 import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
 import com.android.contacts.common.list.PhoneNumberPickerFragment;
-import com.android.contacts.common.util.FabUtil;
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.app.R;
 import com.android.dialer.app.dialpad.DialpadFragment.ErrorDialogFragment;
@@ -155,12 +153,6 @@ public class SearchFragment extends PhoneNumberPickerFragment {
   }
 
   @Override
-  public void onViewCreated(View view, Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-    FabUtil.addBottomPaddingToListViewForFab(getListView(), getResources());
-  }
-
-  @Override
   public Animator onCreateAnimator(int transit, boolean enter, int nextAnim) {
     Animator animator = null;
     if (nextAnim != 0) {
@@ -242,9 +234,6 @@ public class SearchFragment extends PhoneNumberPickerFragment {
     LogUtil.i("SearchFragment.onItemClick", "shortcutType: " + shortcutType);
 
     switch (shortcutType) {
-      case DialerPhoneNumberListAdapter.SHORTCUT_INVALID:
-        super.onItemClick(position, id);
-        break;
       case DialerPhoneNumberListAdapter.SHORTCUT_DIRECT_CALL:
         number = adapter.getQueryString();
         listener = getOnPhoneNumberPickerListener();
@@ -294,6 +283,10 @@ public class SearchFragment extends PhoneNumberPickerFragment {
           listener.onPickPhoneNumber(number, true /* isVideoCall */, callSpecificAppData);
         }
         break;
+      case DialerPhoneNumberListAdapter.SHORTCUT_INVALID:
+      default:
+        super.onItemClick(position, id);
+        break;
     }
   }
 
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/fab_ic_dial.png b/java/com/android/dialer/app/res/drawable-hdpi/fab_ic_dial.png
deleted file mode 100644
index 3cad4c660..000000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/fab_ic_dial.png
+++ /dev/null
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/fab_ic_dial.png b/java/com/android/dialer/app/res/drawable-mdpi/fab_ic_dial.png
deleted file mode 100644
index 4c854e1a1..000000000
--- a/java/com/android/dialer/app/res/drawable-mdpi/fab_ic_dial.png
+++ /dev/null
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/fab_ic_dial.png b/java/com/android/dialer/app/res/drawable-xhdpi/fab_ic_dial.png
deleted file mode 100644
index 398a03cee..000000000
--- a/java/com/android/dialer/app/res/drawable-xhdpi/fab_ic_dial.png
+++ /dev/null
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/fab_ic_dial.png b/java/com/android/dialer/app/res/drawable-xxhdpi/fab_ic_dial.png
deleted file mode 100644
index 5f1cd45fb..000000000
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/fab_ic_dial.png
+++ /dev/null
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/fab_ic_dial.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/fab_ic_dial.png
deleted file mode 100644
index 9361aa864..000000000
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/fab_ic_dial.png
+++ /dev/null
diff --git a/java/com/android/dialer/app/res/drawable/ic_call_detail_content_copy.xml b/java/com/android/dialer/app/res/drawable/ic_call_detail_content_copy.xml
deleted file mode 100644
index 87e0fbc6f..000000000
--- a/java/com/android/dialer/app/res/drawable/ic_call_detail_content_copy.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_content_copy_24dp"
-  android:tint="@color/call_detail_footer_icon_tint"/>
diff --git a/java/com/android/dialer/app/res/drawable/ic_call_detail_edit.xml b/java/com/android/dialer/app/res/drawable/ic_call_detail_edit.xml
deleted file mode 100644
index e6d5c4776..000000000
--- a/java/com/android/dialer/app/res/drawable/ic_call_detail_edit.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_create_24dp"
-  android:tint="@color/call_detail_footer_icon_tint"/>
diff --git a/java/com/android/dialer/app/res/drawable/ic_call_detail_unblock.xml b/java/com/android/dialer/app/res/drawable/ic_call_detail_unblock.xml
deleted file mode 100644
index 3b614cf0d..000000000
--- a/java/com/android/dialer/app/res/drawable/ic_call_detail_unblock.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_unblock"
-  android:tint="@color/call_detail_footer_icon_tint"/>
diff --git a/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml b/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml
index 8d8236a43..45ef933cb 100644
--- a/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml
+++ b/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml
@@ -14,9 +14,10 @@
      limitations under the License.
 -->
 <view xmlns:android="http://schemas.android.com/apk/res/android"
-  class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
   <LinearLayout
     android:layout_width="match_parent"
@@ -66,25 +67,16 @@
         android:layout_height="@dimen/floating_action_button_margin_bottom"
         android:layout_alignParentBottom="true"/>
 
-      <FrameLayout
-        android:id="@+id/dialpad_floating_action_button_container"
-        android:layout_width="@dimen/floating_action_button_width"
-        android:layout_height="@dimen/floating_action_button_height"
-        android:layout_above="@id/dialpad_floating_action_button_margin_bottom"
-        android:layout_centerHorizontal="true"
-        android:background="@drawable/fab_green">
-
-        <ImageButton
+      <android.support.design.widget.FloatingActionButton
           android:id="@+id/dialpad_floating_action_button"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:background="@drawable/floating_action_button"
+          android:layout_width="@dimen/floating_action_button_width"
+          android:layout_height="@dimen/floating_action_button_height"
+          android:layout_above="@id/dialpad_floating_action_button_margin_bottom"
+          android:layout_centerHorizontal="true"
+          android:src="@drawable/quantum_ic_call_white_24"
           android:contentDescription="@string/description_dial_button"
-          android:src="@drawable/fab_ic_call"/>
-
-      </FrameLayout>
-
+          app:elevation="@dimen/floating_action_button_translation_z"
+          app:backgroundTint="@color/dialpad_fab_green"/>
     </RelativeLayout>
-
   </LinearLayout>
 </view>
diff --git a/java/com/android/dialer/app/res/layout/call_detail_history_item.xml b/java/com/android/dialer/app/res/layout/call_detail_history_item.xml
deleted file mode 100644
index 0184a42f2..000000000
--- a/java/com/android/dialer/app/res/layout/call_detail_history_item.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:paddingTop="@dimen/call_log_inner_margin"
-  android:paddingBottom="@dimen/call_log_inner_margin"
-  android:paddingStart="@dimen/call_detail_horizontal_margin"
-  android:paddingEnd="@dimen/call_log_outer_margin"
-  android:orientation="vertical">
-  <LinearLayout
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-    <com.android.dialer.calllogutils.CallTypeIconsView
-      android:id="@+id/call_type_icon"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical"/>
-    <TextView
-      android:id="@+id/call_type_text"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="@dimen/call_log_icon_margin"
-      android:textColor="?android:textColorPrimary"
-      android:textSize="@dimen/call_log_primary_text_size"/>
-  </LinearLayout>
-  <TextView
-    android:id="@+id/date"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:textColor="?android:textColorSecondary"
-    android:textSize="@dimen/call_log_detail_text_size"/>
-  <TextView
-    android:id="@+id/duration"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:textColor="?android:textColorSecondary"
-    android:textSize="@dimen/call_log_detail_text_size"/>
-</LinearLayout>
diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml
index 5b857afa0..fe77ac613 100644
--- a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml
@@ -79,7 +79,7 @@
 
     <ImageView
       style="@style/CallLogActionIconStyle"
-      android:src="@drawable/ic_person_add_24dp"/>
+      android:src="@drawable/quantum_ic_person_add_white_24"/>
 
     <TextView
       style="@style/CallLogActionTextStyle"
diff --git a/java/com/android/dialer/app/res/layout/dialpad_fragment.xml b/java/com/android/dialer/app/res/layout/dialpad_fragment.xml
index 2cf198fcb..dd6dab747 100644
--- a/java/com/android/dialer/app/res/layout/dialpad_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/dialpad_fragment.xml
@@ -14,10 +14,11 @@
      limitations under the License.
 -->
 <view xmlns:android="http://schemas.android.com/apk/res/android"
-  class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="horizontal">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
 
   <LinearLayout
     android:layout_width="match_parent"
@@ -57,22 +58,14 @@
     android:layout_height="@dimen/floating_action_button_margin_bottom"
     android:layout_alignParentBottom="true"/>
 
-  <FrameLayout
-    android:id="@+id/dialpad_floating_action_button_container"
-    android:layout_width="@dimen/floating_action_button_width"
-    android:layout_height="@dimen/floating_action_button_height"
-    android:layout_above="@id/dialpad_floating_action_button_margin_bottom"
-    android:layout_centerHorizontal="true"
-    android:background="@drawable/fab_green">
-
-    <ImageButton
+  <android.support.design.widget.FloatingActionButton
       android:id="@+id/dialpad_floating_action_button"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:background="@drawable/floating_action_button"
+      android:layout_width="@dimen/floating_action_button_width"
+      android:layout_height="@dimen/floating_action_button_height"
+      android:layout_above="@id/dialpad_floating_action_button_margin_bottom"
+      android:layout_centerHorizontal="true"
+      android:src="@drawable/quantum_ic_call_white_24"
       android:contentDescription="@string/description_dial_button"
-      android:src="@drawable/fab_ic_call"/>
-
-  </FrameLayout>
-
+      app:elevation="@dimen/floating_action_button_translation_z"
+      app:backgroundTint="@color/dialpad_fab_green"/>
 </view>
diff --git a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
index 042b4a5e8..958b6944b 100644
--- a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
+++ b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
@@ -38,24 +38,17 @@
       android:clipChildren="false"/>
   </FrameLayout>
 
-  <FrameLayout
-    android:id="@+id/floating_action_button_container"
-    android:layout_width="@dimen/floating_action_button_width"
-    android:layout_height="@dimen/floating_action_button_height"
-    android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
-    android:layout_gravity="center_horizontal|bottom"
-    android:background="@drawable/dialer_fab"
-    app:layout_behavior="com.android.dialer.app.FloatingActionButtonBehavior">
-
-    <ImageButton
+  <android.support.design.widget.FloatingActionButton
       android:id="@+id/floating_action_button"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:background="@drawable/floating_action_button"
+      android:layout_width="@dimen/floating_action_button_width"
+      android:layout_height="@dimen/floating_action_button_height"
+      android:layout_gravity="center_horizontal|bottom"
+      android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
       android:contentDescription="@string/action_menu_dialpad_button"
-      android:src="@drawable/fab_ic_dial"/>
-
-  </FrameLayout>
+      android:src="@drawable/quantum_ic_dialpad_white_24"
+      android:scaleType="center"
+      app:elevation="@dimen/floating_action_button_translation_z"
+      app:backgroundTint="@color/dialer_secondary_color"/>
 
   <!-- Host container for the contact tile drag shadow -->
   <FrameLayout
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 694db606d..6188a5983 100644
--- a/java/com/android/dialer/app/res/values-af/strings.xml
+++ b/java/com/android/dialer/app/res/values-af/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Verwyder"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video-oproep"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Stuur \'n boodskap"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Deel en bel"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Oproepbesonderhede"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Stuur na …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Bel <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Oproep na <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Bel"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Bel <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Maak video-oproep na <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Luister na stemboodskap vanaf <xliff:g id="NAMEORNUMBER">^1</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 382a62b3b..228fe94c6 100644
--- a/java/com/android/dialer/app/res/values-am/strings.xml
+++ b/java/com/android/dialer/app/res/values-am/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"አስወግድ"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"የቪዲዮ ጥሪ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"መልእክት ላክ"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"ያጋሩ እና ይደውሉ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"የጥሪ ዝርዝሮች"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ላክ ወደ…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ይደውሉ"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"ወደ <xliff:g id="NAMEORNUMBER">^1</xliff:g>፣ <xliff:g id="TYPEORLOCATION">^2</xliff:g>፣ <xliff:g id="TIMEOFCALL">^3</xliff:g>፣ <xliff:g id="PHONEACCOUNT">^4</xliff:g> ደውል።"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"በ <xliff:g id="NUMBER">%1$s</xliff:g> በኩል"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> በ <xliff:g id="NUMBER">%2$s</xliff:g> በኩል"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"ደውል"</string>
     <string name="description_call_action" msgid="4042796498169106545">"ወደ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ይደውሉ"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"ቪዲዮ ጥሪ <xliff:g id="NAMEORNUMBER">^1</xliff:g>።"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"የ<xliff:g id="NAMEORNUMBER">^1</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 6170f9ee9..2d9c7e8e0 100644
--- a/java/com/android/dialer/app/res/values-ar/strings.xml
+++ b/java/com/android/dialer/app/res/values-ar/strings.xml
@@ -148,7 +148,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"إزالة"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"مكالمة فيديو"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"إرسال رسالة"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"المشاركة والاتصال"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"تفاصيل المكالمة"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"إرسال إلى ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"الاتصال بـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -159,7 +158,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"اتصال بـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"من خلال <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> من خلال <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"اتصال"</string>
     <string name="description_call_action" msgid="4042796498169106545">"الاتصال بـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"إجراء مكالمة فيديو مع <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"استماع إلى بريد صوتي من <xliff:g id="NAMEORNUMBER">^1</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 de64279ff..e2e9bea50 100644
--- a/java/com/android/dialer/app/res/values-az/strings.xml
+++ b/java/com/android/dialer/app/res/values-az/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Yığışdır"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video zəng"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Mesaj göndərin"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Paylaşın və zəng edin"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Zəng detalları"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Bu şəxsə göndərin:"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> nömrəsinə zəng edin"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Zəng et: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> vasitəsilə"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g> vasitəsilə"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Çağrı"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Çağrı <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> video zəng edin."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> tərəfdən səsli mesajı dinləyin"</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 d31f6deed..337a62617 100644
--- a/java/com/android/dialer/app/res/values-be/strings.xml
+++ b/java/com/android/dialer/app/res/values-be/strings.xml
@@ -146,7 +146,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Выдаліць"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Відэавыклік"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Адправiць паведамленне"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Абагуліць і выклікаць"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Падрабязнасці выкліку"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Адпраўляецца да…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Выклікаць <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -157,7 +156,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Выклік абаненту <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"праз <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> праз <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Выклікаць"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Выклікаць <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Відэавыклік ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Праслухаць галасавое паведамленне ад <xliff:g id="NAMEORNUMBER">^1</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 3dc56ce99..510b4a2d0 100644
--- a/java/com/android/dialer/app/res/values-bg/strings.xml
+++ b/java/com/android/dialer/app/res/values-bg/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Премахване"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видеообаждане"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Изпращане на съобщение"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Споделяне и обаждане"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Подробности за обаждането"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Изпращане до…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Обаждане до <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Обаждане до <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"през <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> през <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Обаждане"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Обаждане на <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Видеообаждане до <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Прослушване на гласовата поща от <xliff:g id="NAMEORNUMBER">^1</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 b94b046dd..ece833ce7 100644
--- a/java/com/android/dialer/app/res/values-bn/strings.xml
+++ b/java/com/android/dialer/app/res/values-bn/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"সরান"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ভিডিও কল"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"একটি বার্তা পাঠান"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"শেয়ার এবং কল করুন"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"কলের বিশদ বিবরণ"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"এতে পাঠান ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর কল"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> এ কল করুন৷"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> এর মাধ্যমে"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> এর মাধ্যমে <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"কল করুন"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর কল"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-এ ভিডিও কল করুন।"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 c516f7b7c..98506dc45 100644
--- a/java/com/android/dialer/app/res/values-bs/strings.xml
+++ b/java/com/android/dialer/app/res/values-bs/strings.xml
@@ -145,7 +145,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Ukloni"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videopoziv"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošalji poruku"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Podijeli i pozovi"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalji o pozivu"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Pošalji na …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Pozovi kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -156,7 +155,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Pozovi kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"preko <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> preko <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Pozovi"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Pozovi kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Uputi videopoziv kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Preslušaj govornu poštu od kontakta <xliff:g id="NAMEORNUMBER">^1</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 9f7174049..781c6064e 100644
--- a/java/com/android/dialer/app/res/values-ca/strings.xml
+++ b/java/com/android/dialer/app/res/values-ca/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Suprimeix"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videotrucada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Envia un missatge"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Comparteix i truca"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalls de la trucada"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Envia a…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Truca a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Trucada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"al número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> al número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Truca"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Truca a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videotrucada amb <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Escolta el missatge a la bústia de veu de: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
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 49fd3bbb7..4f35d9cff 100644
--- a/java/com/android/dialer/app/res/values-cs/strings.xml
+++ b/java/com/android/dialer/app/res/values-cs/strings.xml
@@ -146,7 +146,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Odstranit"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videohovor"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Odeslat zprávu"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Sdílet a zavolat"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Podrobnosti hovoru"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Poslat přes aplikaci…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Volat kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -157,7 +156,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Odchozí hovor: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"z čísla <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"na účet <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, z čísla <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Volat"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Volat kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videohovor s kontaktem <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Poslech hlasové schránky od <xliff:g id="NAMEORNUMBER">^1</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 65d27345f..c3d44c01f 100644
--- a/java/com/android/dialer/app/res/values-da/strings.xml
+++ b/java/com/android/dialer/app/res/values-da/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Fjern"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoopkald"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send en sms-besked"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Del og ring"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Opkaldsinfo"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send til…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Ring op"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videoopkald <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Lyt til indtalt besked fra <xliff:g id="NAMEORNUMBER">^1</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 8f18f0baa..d6195ba30 100644
--- a/java/com/android/dialer/app/res/values-de/strings.xml
+++ b/java/com/android/dialer/app/res/values-de/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Entfernen"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoanruf"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"SMS senden"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Teilen und anrufen"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Anrufdetails"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Senden an…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> anrufen"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Ausgehender Anruf an <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"über <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> über <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Anrufen"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> anrufen"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> über Videoanruf anrufen"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Mailboxnachricht von <xliff:g id="NAMEORNUMBER">^1</xliff:g> anhören"</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 974cf1ac6..620ae1130 100644
--- a/java/com/android/dialer/app/res/values-el/strings.xml
+++ b/java/com/android/dialer/app/res/values-el/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Κατάργηση"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Βιντεοκλήση"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Αποστολή μηνύματος"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Κοινοποίηση και κλήση"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Λεπτομέρειες κλήσης"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Αποστολή προς …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Κλήση <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Κλήση προς <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"μέσω <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> μέσω <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Κλήση"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Κλήση <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Βιντεοκλήση <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ακρόαση μηνύματος αυτόματου τηλεφωνητή από το χρήστη <xliff:g id="NAMEORNUMBER">^1</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 03e37bf53..e9a508510 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
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Remove"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video call"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send a message"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Share and call"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Call details"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send to…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Call to <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Call"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Video call <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Listen to voicemail from <xliff:g id="NAMEORNUMBER">^1</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 03e37bf53..e9a508510 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
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Remove"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video call"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send a message"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Share and call"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Call details"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send to…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Call to <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Call"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Video call <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Listen to voicemail from <xliff:g id="NAMEORNUMBER">^1</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 03e37bf53..e9a508510 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
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Remove"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video call"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send a message"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Share and call"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Call details"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send to…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Call to <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Call"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Video call <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Listen to voicemail from <xliff:g id="NAMEORNUMBER">^1</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 69c5c0423..798742fb1 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
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Eliminar"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videollamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar un mensaje"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Compartir y llamar"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalles de la llamada"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar a…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"a través de <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> a través de <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Llamar"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Realizar una videollamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Escuchar buzón de voz de <xliff:g id="NAMEORNUMBER">^1</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 9c1292004..26ea210c7 100644
--- a/java/com/android/dialer/app/res/values-es/strings.xml
+++ b/java/com/android/dialer/app/res/values-es/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Eliminar"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videollamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar un mensaje"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Compartir y llamar"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalles de la llamada"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar a…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"a través del <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> a través del <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Llamar"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videollamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Escuchar el buzón de voz de <xliff:g id="NAMEORNUMBER">^1</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 89bf2cb14..de64ecbb2 100644
--- a/java/com/android/dialer/app/res/values-et/strings.xml
+++ b/java/com/android/dialer/app/res/values-et/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Eemalda"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videokõne"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Saada sõnum"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Jaga ja helista"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Kõne üksikasjad"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Saada: …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Helistamine: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Kõne: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"numbri <xliff:g id="NUMBER">%1$s</xliff:g> kaudu"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> numbri <xliff:g id="NUMBER">%2$s</xliff:g> kaudu"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Helistamine"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Helistamine: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videokõne kirjele <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Kontakti <xliff:g id="NAMEORNUMBER">^1</xliff:g> kõneposti kuulamine"</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 944a851f9..688de91dc 100644
--- a/java/com/android/dialer/app/res/values-eu/strings.xml
+++ b/java/com/android/dialer/app/res/values-eu/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Kendu"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Bideo-deia"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Bidali mezua"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Partekatu eta deitu"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Deiaren xehetasunak"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Bidali hona…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Deitu: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Egindako deiaren xehetasunak: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> bidez"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> bidez"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Deitu"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Deitu <xliff:g id="NAMEORNUMBER">^1</xliff:g> deitzaileari"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Egin bideo-deia (<xliff:g id="NAMEORNUMBER">^1</xliff:g>)."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Deitzaile honek erantzungailuan utzitako ahots-mezuak entzutea: <xliff:g id="NAMEORNUMBER">^1</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 065611fe7..6a2c1ce94 100644
--- a/java/com/android/dialer/app/res/values-fa/strings.xml
+++ b/java/com/android/dialer/app/res/values-fa/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"حذف"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"تماس ویدئویی"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ارسال پیام"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"اشتراک‌گذاری و تماس"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"جزئیات تماس"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ارسال به..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"تماس با <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"تماس با <xliff:g id="NAMEORNUMBER">^1</xliff:g>، ‏<xliff:g id="TYPEORLOCATION">^2</xliff:g>، ‏<xliff:g id="TIMEOFCALL">^3</xliff:g>، ‏<xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"از طریق <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> از طریق <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"تماس"</string>
     <string name="description_call_action" msgid="4042796498169106545">"تماس با <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"تماس ویدئویی با <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"گوش دادن به پست صوتی از <xliff:g id="NAMEORNUMBER">^1</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 9e4ddeb7d..da70c087c 100644
--- a/java/com/android/dialer/app/res/values-fi/strings.xml
+++ b/java/com/android/dialer/app/res/values-fi/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Poista"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videopuhelu"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Lähetä viesti"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Jaa ja soita"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Puhelun tiedot"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Vastaanottaja: …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Soita: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Soita vastaanottajalle <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"numerosta <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> numerosta <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Soita"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Soita: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Soita videopuhelu: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Kuuntele vastaajaviesti: <xliff:g id="NAMEORNUMBER">^1</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 2dc1412ec..84dcbc89d 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
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Supprimer"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Appel vidéo"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Envoyer un message"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Partager et appeler"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Détails de l\'appel"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Envoyer à…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Appeler <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Appel effectué : <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"au <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, au <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Appeler"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Appeler <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Appel vidéo avec <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Écouter le message vocal de <xliff:g id="NAMEORNUMBER">^1</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 4119eb6e9..6f03106c4 100644
--- a/java/com/android/dialer/app/res/values-fr/strings.xml
+++ b/java/com/android/dialer/app/res/values-fr/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Supprimer"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Appel vidéo"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Envoyer un message"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Partager et appeler"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Informations sur l\'appel"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Envoyer à…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Appeler <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Appel émis <xliff:g id="TIMEOFCALL">^3</xliff:g> (destinataire : <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"au <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> au <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Appeler"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Appeler <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Appel vidéo de \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\""</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Écouter le message vocal laissé par le numéro ou le contact \"<xliff:g id="NAMEORNUMBER">^1</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 621b7044a..4d4e69377 100644
--- a/java/com/android/dialer/app/res/values-gl/strings.xml
+++ b/java/com/android/dialer/app/res/values-gl/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Eliminar"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar unha mensaxe"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Compartir e chamar"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalles da chamada"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar a…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Chamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Chamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"a través do <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> a través do <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Chamar"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Chamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videochamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Escoitar o correo de voz de <xliff:g id="NAMEORNUMBER">^1</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 cf756cd10..726d473a1 100644
--- a/java/com/android/dialer/app/res/values-gu/strings.xml
+++ b/java/com/android/dialer/app/res/values-gu/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"દૂર કરો"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"વિડિઓ કૉલ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"એક સંદેશ મોકલો"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"શેર કરો અને કૉલ કરો"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"કૉલની વિગતો"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"આને મોકલો ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ને કૉલ કરો"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> પર કૉલ."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> મારફતે"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> પર, <xliff:g id="NUMBER">%2$s</xliff:g> મારફતે"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"કૉલ કરો"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ને કૉલ કરો"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ને વિડિઓ કૉલ કરો."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 f9343a4ba..f44d45bcb 100644
--- a/java/com/android/dialer/app/res/values-hi/strings.xml
+++ b/java/com/android/dialer/app/res/values-hi/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"निकालें"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"वीडियो कॉल"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"संदेश भेजें"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"साझा करें और कॉल करें"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"कॉल विवरण"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"इन्हें भेजें …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> को कॉल करें"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> पर किया गया कॉल."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> से"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g> से"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"कॉल करें"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> को कॉल करें"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> को वीडियो कॉल करें."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 cec225a6f..0e5d0d0ec 100644
--- a/java/com/android/dialer/app/res/values-hr/strings.xml
+++ b/java/com/android/dialer/app/res/values-hr/strings.xml
@@ -145,7 +145,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Ukloni"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videopoziv"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošalji poruku"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Dijeli i pozovi"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Pojedinosti poziva"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Pošalji na..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Nazovi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -156,7 +155,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Poziv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"putem <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> putem <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Poziv"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Pozovi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videopoziv <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Slušanje govorne pošte kontakta <xliff:g id="NAMEORNUMBER">^1</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 b1698aa9d..fcc4454e2 100644
--- a/java/com/android/dialer/app/res/values-hu/strings.xml
+++ b/java/com/android/dialer/app/res/values-hu/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Eltávolítás"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videohívás"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Üzenet küldése"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Megosztás és hívás"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Hívás adatai"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Címzett…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> hívása"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Kimenő hívás: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"szám: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, szám: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Telefonhívás"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> hívása"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"A következő hívása videokapcsolattal: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> hangpostaüzenetének meghallgatása"</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 b9009aa1d..008d34f17 100644
--- a/java/com/android/dialer/app/res/values-hy/strings.xml
+++ b/java/com/android/dialer/app/res/values-hy/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Հեռացնել"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Տեսազանգ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Ուղարկել հաղորդագրություն"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Կիսվել և զանգել"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Զանգի մանրամասները"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Ուղարկել…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Զանգել <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ին"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Զանգ <xliff:g id="NAMEORNUMBER">^1</xliff:g> կոնտակտին, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>:"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> համարի միջոցով"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>-ին <xliff:g id="NUMBER">%2$s</xliff:g> համարի միջոցով"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Զանգել"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Զանգել <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ին"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Տեսազանգ <xliff:g id="NAMEORNUMBER">^1</xliff:g> կոնտակտին:"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Լսել ձայնային փոստը <xliff:g id="NAMEORNUMBER">^1</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 18c775f1b..a133a6542 100644
--- a/java/com/android/dialer/app/res/values-in/strings.xml
+++ b/java/com/android/dialer/app/res/values-in/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Hapus"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Panggilan video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Kirim pesan"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Bagikan dan telepon"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detail panggilan"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Kirim ke…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Telepon <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Panggilan ke <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"melalui <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> melalui <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Telepon"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Telepon <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Lakukan panggilan video ke <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Dengarkan kotak pesan dari <xliff:g id="NAMEORNUMBER">^1</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 a6ca10068..c9dc4f371 100644
--- a/java/com/android/dialer/app/res/values-is/strings.xml
+++ b/java/com/android/dialer/app/res/values-is/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Fjarlægja"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Myndsímtal"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Senda skilaboð"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Deila og hringja"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Símtalsupplýsingar"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Senda til …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Hringja í <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Símtal til <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"í gegnum <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> í gegnum <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Hringja"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Hringja í <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Hringja myndsímtal í <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Hlusta á talhólfsskilaboð frá <xliff:g id="NAMEORNUMBER">^1</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 dda0dea77..1465c91e1 100644
--- a/java/com/android/dialer/app/res/values-it/strings.xml
+++ b/java/com/android/dialer/app/res/values-it/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Rimuovi"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochiamata"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Invia un messaggio"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Condividi e chiama"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Dettagli chiamata"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Invia a…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Chiama <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Chiamata a <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"tramite <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> tramite <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Chiama"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Chiama <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videochiamata <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ascolta il messaggio vocale di: <xliff:g id="NAMEORNUMBER">^1</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 fe85d9db8..efb655322 100644
--- a/java/com/android/dialer/app/res/values-iw/strings.xml
+++ b/java/com/android/dialer/app/res/values-iw/strings.xml
@@ -146,7 +146,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"הסר"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"שיחת וידאו"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"שלח הודעה"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"שתף והתקשר"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"פרטי שיחה"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"שלח אל..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"התקשר אל <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -157,7 +156,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"שיחה אל <xliff:g id="NAMEORNUMBER">^1</xliff:g>‏, <xliff:g id="TYPEORLOCATION">^2</xliff:g>‏, <xliff:g id="TIMEOFCALL">^3</xliff:g>‏, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"דרך <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> דרך <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"התקשר"</string>
     <string name="description_call_action" msgid="4042796498169106545">"התקשר אל <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"שיחת וידאו עם <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"האזן לדואר קולי מאת <xliff:g id="NAMEORNUMBER">^1</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 5503d4bfc..ccdf01759 100644
--- a/java/com/android/dialer/app/res/values-ja/strings.xml
+++ b/java/com/android/dialer/app/res/values-ja/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"削除"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ビデオハングアウト"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"メッセージを送信"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"共有して発信"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"通話の詳細"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"送信先…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>に発信"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="TIMEOFCALL">^3</xliff:g>の<xliff:g id="TYPEORLOCATION">^2</xliff:g><xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="PHONEACCOUNT">^4</xliff:g>）への発信。"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> で受信"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>（<xliff:g id="NUMBER">%2$s</xliff:g>）で受信"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"発信"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>に発信します"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>にビデオハングアウト発信します。"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 561f1e799..bebf1c542 100644
--- a/java/com/android/dialer/app/res/values-ka/strings.xml
+++ b/java/com/android/dialer/app/res/values-ka/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"ამოშლა"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ვიდეო ზარი"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"შეტყობინების გაგზავნა"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"გაზიარება და დარეკვა"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ზარის მონაცემები"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"გაგზავნა:"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-თან დარეკვა"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"ზარი აბონენტთან <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g>-ის მეშვეობით"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g>-ის მეშვეობით"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"დარეკვა"</string>
     <string name="description_call_action" msgid="4042796498169106545">"დარეკვა <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"ვიდეო ზარი <xliff:g id="NAMEORNUMBER">^1</xliff:g>-თან."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 b607c18c9..7fa5d33ec 100644
--- a/java/com/android/dialer/app/res/values-kk/strings.xml
+++ b/java/com/android/dialer/app/res/values-kk/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Алып тастау"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Бейне қоңырау"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Хабар жіберу"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Бөлісу және қоңырау шалу"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Қоңырау мәліметтері"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Жіберу:"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> нөміріне қоңырау шалу"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> нөміріне қоңырау шалу, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"Нөмірі: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>. Нөмірі: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Қоңырау шалу"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> нөміріне қоңырау шалу"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> бейне қоңырау шалу."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 6cbae9804..3b6fe9e71 100644
--- a/java/com/android/dialer/app/res/values-km/strings.xml
+++ b/java/com/android/dialer/app/res/values-km/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"លុបចេញ"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ហៅជាវីដេអូ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ផ្ញើសារ"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"ចែករំលែក និងហៅទូរសព្ទ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ព័ត៌មានលម្អិតអំពីការហៅ"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ផ្ញើទៅ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"ហៅ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"ហៅទៅ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>។"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"តាមរយៈ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> តាមរយៈ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"ហៅ"</string>
     <string name="description_call_action" msgid="4042796498169106545">"ហៅ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"ហៅទៅ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ជាវីដេអូ។"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"ស្ដាប់សារជាសំឡេងពី <xliff:g id="NAMEORNUMBER">^1</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 e99a2c64b..68280f1f3 100644
--- a/java/com/android/dialer/app/res/values-kn/strings.xml
+++ b/java/com/android/dialer/app/res/values-kn/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"ತೆಗೆದುಹಾಕು"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ವೀಡಿಯೊ ಕರೆ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ಕರೆಯ ವಿವರಗಳು"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ಇದಕ್ಕೆ ಕಳುಹಿಸಿ ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಕರೆ ಮಾಡಿ"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ಗೆ ಕರೆ."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> ಮೂಲಕ"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> ಮೂಲಕ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"ಕರೆಮಾಡಿ"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಕರೆ ಮಾಡಿ"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಗೆ ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 3f35ed420..f72a69139 100644
--- a/java/com/android/dialer/app/res/values-ko/strings.xml
+++ b/java/com/android/dialer/app/res/values-ko/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"삭제"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"화상 통화"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"메시지 보내기"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"공유 및 전화 걸기"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"통화 세부정보"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"수신자"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에 전화 걸기"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에게 건 전화(<xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g>번으로 수신"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>번으로 수신"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"통화"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에 전화 걸기"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에 화상 통화 걸기"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 117103088..34d87da09 100644
--- a/java/com/android/dialer/app/res/values-ky/strings.xml
+++ b/java/com/android/dialer/app/res/values-ky/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Алып салуу"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видео чалуу"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Билдирүү жөнөтүү"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Бөлүшүү жана чалуу"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Чалуунун чоо-жайы"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Төмөнкүгө жөнөтүү…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> чалуу"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> дегенге чалуу."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> аркылуу"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> аркылуу <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Чалуу"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> чалуу"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> видео чалуу."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 8b0ddef49..4bdb11338 100644
--- a/java/com/android/dialer/app/res/values-lo/strings.xml
+++ b/java/com/android/dialer/app/res/values-lo/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"ລຶບອອກ"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ໂທດ້ວຍວິດີໂອ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"ແບ່ງປັນ ແລະ ໂທ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ລາຍລະອຽດການໂທ"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ສົ່ງໄປ ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"ໂທຫາ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"ໂທຫາ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"ຜ່ານ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ຜ່ານ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"ໂທ"</string>
     <string name="description_call_action" msgid="4042796498169106545">"ໂທຫາ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"ການໂທວິດີໂອ <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"ຟັງຂໍ້ຄວາມສຽງຈາກ <xliff:g id="NAMEORNUMBER">^1</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 84c79169f..5266dd1b8 100644
--- a/java/com/android/dialer/app/res/values-lt/strings.xml
+++ b/java/com/android/dialer/app/res/values-lt/strings.xml
@@ -146,7 +146,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Pašalinti"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Vaizdo skambutis"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Siųsti pranešimą"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Bendrinti ir skambinti"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Išsami skambučio informacija"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Siųsti…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Skambinti <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -157,7 +156,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Skambutis: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"numeriu <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> numeriu <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Skambinti"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Skambinti <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Vaizdo skambutis <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Klausyti balso pašto nuo <xliff:g id="NAMEORNUMBER">^1</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 5aa0f562f..e36a47eae 100644
--- a/java/com/android/dialer/app/res/values-lv/strings.xml
+++ b/java/com/android/dialer/app/res/values-lv/strings.xml
@@ -145,7 +145,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Noņemt"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videozvans"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Sūtīt ziņojumu"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Kopīgot un zvanīt"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Informācija par zvanu"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Nosūtīt uz…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Zvanīt: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -156,7 +155,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Izejošs zvans: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"izmantojot numuru <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, izmantojot numuru <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Zvanīt"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Zvanīt: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Zvaniet kontaktpersonai <xliff:g id="NAMEORNUMBER">^1</xliff:g>, izmantojot videozvanu."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Klausīties balss pasta ziņojumu no: <xliff:g id="NAMEORNUMBER">^1</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 0178e77ef..742250d03 100644
--- a/java/com/android/dialer/app/res/values-mk/strings.xml
+++ b/java/com/android/dialer/app/res/values-mk/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Отстрани"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видеоповик"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Испрати порака"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Споделете и повикајте"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Детали на повик"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Испрати на…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Повикај <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Повик до <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"на <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> на <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Повикај"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Повикај <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Видеоповик до <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Слушајте говорна пошта од <xliff:g id="NAMEORNUMBER">^1</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 b581db7d9..857973aaa 100644
--- a/java/com/android/dialer/app/res/values-ml/strings.xml
+++ b/java/com/android/dialer/app/res/values-ml/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"നീക്കംചെയ്യുക"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"വീഡിയോ കോള്‍"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ഒരു സന്ദേശം അയയ്‌ക്കുക"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"പങ്കിടുക, കോൾ ചെയ്യുക"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"കോൾ വിശദാംശങ്ങൾ"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ഇതിലേക്ക് അയയ്‌ക്കുക ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്ന നമ്പർ/വ്യക്തിയെ വിളിക്കൂ"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> എന്നതിലേക്കുള്ള കോൾ."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> നമ്പർ വഴി"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> നമ്പർ വഴി, <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"വിളിക്കുക"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> വിളിക്കുക"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്നതുമായി വീഡിയോ കോൾ നടത്തുക."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 5f4440997..decd08116 100644
--- a/java/com/android/dialer/app/res/values-mn/strings.xml
+++ b/java/com/android/dialer/app/res/values-mn/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Хасах"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видео дуудлага"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Зурвас илгээх"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Хуваалцаад залгах"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Дуудлагын мэдээлэл"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Илгээх ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> руу дуудлага хийх"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Дараах дугаар луу залгасан <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g>-р"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g>-р <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Дуудлага"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> руу дуудлага хийх"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ын видео дуудлага."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 599c6c3e6..71233ac0e 100644
--- a/java/com/android/dialer/app/res/values-mr/strings.xml
+++ b/java/com/android/dialer/app/res/values-mr/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"काढा"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"व्हिडिओ कॉल"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"एक संदेश पाठवा"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"सामायिक करा आणि कॉल करा"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"कॉल तपशील"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"यांना पाठवा ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> वर कॉल करा"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> वर कॉल करा."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> द्वारे"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> द्वारे <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"कॉल करा"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> वर कॉल करा"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"व्हिडिओ कॉल <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 34d997b44..4373c7ca6 100644
--- a/java/com/android/dialer/app/res/values-ms/strings.xml
+++ b/java/com/android/dialer/app/res/values-ms/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Alih keluar"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Panggilan video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Hantar mesej"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Kongsi dan hubungi"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Butiran panggilan"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Hantar ke ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Panggil <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Buat panggilan kepada <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"melalui <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> melalui <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Panggil"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Panggil <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Panggilan video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Dengar mel suara daripada <xliff:g id="NAMEORNUMBER">^1</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 818928ab6..fa317bce4 100644
--- a/java/com/android/dialer/app/res/values-my/strings.xml
+++ b/java/com/android/dialer/app/res/values-my/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"ဖယ်ရှာခြင်း"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ဗီဒီယို ခေါ်ဆိုမှု"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"စာ တစ်စောင် ပို့ပါ"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"မျှဝေပြီး ခေါ်ဆိုရန်"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ဖုန်းခေါ်မှု အသေးစိတ်အချက်အလက်"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"... သို့ ပို့ပါ"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> အား ခေါ်ပါ"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>၊ <xliff:g id="TYPEORLOCATION">^2</xliff:g>၊ <xliff:g id="TIMEOFCALL">^3</xliff:g>၊ <xliff:g id="PHONEACCOUNT">^4</xliff:g> အား ခေါ်ခြင်း။"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> မှတစ်ဆင့်"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g> မှတစ်ဆင့်"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"ခေါ်ဆိုမှု"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> အားခေါ်ရန်"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ကိုဗီဒီယိုခေါ်ဆိုမည်။"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 4a49a8d36..488864f3e 100644
--- a/java/com/android/dialer/app/res/values-nb/strings.xml
+++ b/java/com/android/dialer/app/res/values-nb/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Fjern"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoanrop"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send en melding"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Del og ring"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Samtaleinformasjon"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send til …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Ring"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Start videoanrop med <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Lytt til talepostkasse fra <xliff:g id="NAMEORNUMBER">^1</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 7820e6726..29eaccdb5 100644
--- a/java/com/android/dialer/app/res/values-ne/strings.xml
+++ b/java/com/android/dialer/app/res/values-ne/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"हटाउँनुहोस्"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"भिडियो कल"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"सन्देश पठाउनुहोस्"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"आदान-प्रदान र कल गर्नुहोस्"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"कल विवरणहरु"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"…मा पठाउनुहोस्"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> कल गर्नुहोस्"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> लाई कल गर्नुहोस्।"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> मार्फत"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> मार्फत <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"कल गर्नुहोस्"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> कल गर्नुहोस्"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> भिडियो कल गर्नुहोस्।"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 8ad8881b4..986236e4f 100644
--- a/java/com/android/dialer/app/res/values-nl/strings.xml
+++ b/java/com/android/dialer/app/res/values-nl/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Verwijderen"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videogesprek"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Een bericht verzenden"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Delen en bellen"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Oproepdetails"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Verzenden naar…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> bellen"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Oproep naar <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Bellen"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> bellen"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videogesprek <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Voicemail beluisteren van <xliff:g id="NAMEORNUMBER">^1</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 4a49a8d36..488864f3e 100644
--- a/java/com/android/dialer/app/res/values-no/strings.xml
+++ b/java/com/android/dialer/app/res/values-no/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Fjern"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoanrop"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send en melding"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Del og ring"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Samtaleinformasjon"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send til …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Ring"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Start videoanrop med <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Lytt til talepostkasse fra <xliff:g id="NAMEORNUMBER">^1</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 8dfd83876..6e9cc03a9 100644
--- a/java/com/android/dialer/app/res/values-pa/strings.xml
+++ b/java/com/android/dialer/app/res/values-pa/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"ਹਟਾਓ"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ਵੀਡੀਓ ਕਾਲ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ਕਾਲ ਵੇਰਵੇ"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ਇਸ \'ਤੇ ਭੇਜੋ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ।"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> ਰਾਹੀਂ"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> ਰਾਹੀਂ"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"ਕਾਲ ਕਰੋ"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"ਵੀਡੀਓ ਕਾਲ <xliff:g id="NAMEORNUMBER">^1</xliff:g>।"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 56f4341ad..0c8f43ff6 100644
--- a/java/com/android/dialer/app/res/values-pl/strings.xml
+++ b/java/com/android/dialer/app/res/values-pl/strings.xml
@@ -146,7 +146,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Usuń"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Rozmowa wideo"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Wyślij wiadomość"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Udostępnij i zadzwoń"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Szczegóły połączenia"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Wyślij do…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Zadzwoń: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -157,7 +156,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Połączenie: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"przez <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> przez <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Zadzwoń"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Zadzwoń: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Rozpocznij rozmowę wideo z: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Posłuchaj wiadomości głosowej od: <xliff:g id="NAMEORNUMBER">^1</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 ba6cd5d91..4f090df6e 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
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Remover"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar uma mensagem"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Compartilhar e ligar"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalhes da chamada"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar para…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Ligar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Chamada para <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"por <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> por <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Ligar"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Ligar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videochamada <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ouvir mensagem de voz de <xliff:g id="NAMEORNUMBER">^1</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 f5e851731..9cabdc4a5 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
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Remover"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar uma mensagem"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Partilhar e ligar"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalhes da chamada"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar para…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Telefonar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Telefonar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"através do número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> através do número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Telefonar"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Telefonar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Fazer videochamada com <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ouvir o correio de voz de <xliff:g id="NAMEORNUMBER">^1</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 ba6cd5d91..4f090df6e 100644
--- a/java/com/android/dialer/app/res/values-pt/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Remover"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar uma mensagem"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Compartilhar e ligar"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalhes da chamada"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar para…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Ligar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Chamada para <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"por <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> por <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Ligar"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Ligar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videochamada <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ouvir mensagem de voz de <xliff:g id="NAMEORNUMBER">^1</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 8c533e698..3a083ae74 100644
--- a/java/com/android/dialer/app/res/values-ro/strings.xml
+++ b/java/com/android/dialer/app/res/values-ro/strings.xml
@@ -145,7 +145,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Eliminați"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Apel video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Trimiteți un mesaj"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Trimiteți și apelați"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detaliile apelului"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Trimiteți către …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Apelați <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -156,7 +155,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Apel către <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"prin <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> prin <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Apelați"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Apelați <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Apelați video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ascultați mesajul vocal de la <xliff:g id="NAMEORNUMBER">^1</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 b592d772d..925d684a5 100644
--- a/java/com/android/dialer/app/res/values-ru/strings.xml
+++ b/java/com/android/dialer/app/res/values-ru/strings.xml
@@ -146,7 +146,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Удалить"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видеовстреча"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Отправить сообщение"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Поделиться и позвонить"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Сведения о вызове"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Отправить"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Позвонить: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -157,7 +156,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Вызов контакту <xliff:g id="NAMEORNUMBER">^1</xliff:g>. <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"Номер: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>. Номер: <xliff:g id="NUMBER">%2$s</xliff:g>."</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Вызов"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Позвонить: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Видеовстреча: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Прослушать сообщение от контакта <xliff:g id="NAMEORNUMBER">^1</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 4be616256..55ce37b81 100644
--- a/java/com/android/dialer/app/res/values-si/strings.xml
+++ b/java/com/android/dialer/app/res/values-si/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"ඉවත් කරන්න"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"වීඩියෝ ඇමතුම"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"පණිවිඩයක් යවන්න"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"බෙදා ගන්න සහ අමතන්න"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ඇමතුම් විස්තර"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"වෙත යවන්න …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> අමතන්න"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> වෙත ඇමතුමක්."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> හරහා"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> හරහා <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"ඇමතුම"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> අමතන්න"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>. වීඩියෝ ඇමතුම"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 0b1e50520..59f3d10f1 100644
--- a/java/com/android/dialer/app/res/values-sk/strings.xml
+++ b/java/com/android/dialer/app/res/values-sk/strings.xml
@@ -146,7 +146,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Odstrániť"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videohovor"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Odoslať správu"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Zdieľať a volať"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Podrobnosti hovoru"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Poslať cez aplikáciu…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Zavolať kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -157,7 +156,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Volanie – kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"prostredníctvom čísla <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> prostredníctvom čísla <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Volať"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Zavolať kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Spustiť videohovor s kontaktom <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Vypočuť si správu v hlasovej schránke od používateľa <xliff:g id="NAMEORNUMBER">^1</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 0cee65ca9..28f4ce021 100644
--- a/java/com/android/dialer/app/res/values-sl/strings.xml
+++ b/java/com/android/dialer/app/res/values-sl/strings.xml
@@ -146,7 +146,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Odstrani"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoklic"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošljite sporočilo"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Omogoči skupno rabo in pokliči"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Podrobnosti klica"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Pošlji …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Kliči osebo/številko <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -157,7 +156,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Klic za: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"prek številke <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> prek številke <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Klic"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Klicanje: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videoklic: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Poslušajte sporočilo v odzivniku od: <xliff:g id="NAMEORNUMBER">^1</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 2b96ad566..48ec8fee8 100644
--- a/java/com/android/dialer/app/res/values-sq/strings.xml
+++ b/java/com/android/dialer/app/res/values-sq/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Hiq"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Telefonatë me video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Dërgo një mesazh"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Ndaj dhe telefono"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detajet e telefonatës"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Dërgo te ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Telefono <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Telefonatë për <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"nëpërmjet <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> nëpërmjet <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Telefono"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Telefono <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Telefono me video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Dëgjo postën zanore nga <xliff:g id="NAMEORNUMBER">^1</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 52525ca49..fd4e2b9ba 100644
--- a/java/com/android/dialer/app/res/values-sr/strings.xml
+++ b/java/com/android/dialer/app/res/values-sr/strings.xml
@@ -145,7 +145,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Уклони"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видео позив"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Пошаљи поруку"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Дели и позови"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Детаљи позива"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Пошаљи у…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Позови <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -156,7 +155,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Позвали сте: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"преко <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> преко <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Позови"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Позови <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Упутите видео позив контакту <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Пусти говорну пошту од <xliff:g id="NAMEORNUMBER">^1</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 10153f7ab..fc8920a38 100644
--- a/java/com/android/dialer/app/res/values-sv/strings.xml
+++ b/java/com/android/dialer/app/res/values-sv/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Ta bort"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videosamtal"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Skicka ett meddelande"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Dela och ring"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Samtalsinfo"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Skicka till …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Ring till <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"med <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> med <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Samtal"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Ring videosamtal till <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Lyssna på ett röstmeddelande från <xliff:g id="NAMEORNUMBER">^1</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 fbca33741..4c469979a 100644
--- a/java/com/android/dialer/app/res/values-sw/strings.xml
+++ b/java/com/android/dialer/app/res/values-sw/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Ondoa"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Hangout ya Video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Tuma SMS"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Shiriki na upige simu"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Maelezo ya simu"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Tuma kwenye …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Piga simu kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Simu iliyopigwa kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"kupitia <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> kupitia <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Piga simu"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Piga simu kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Hangout ya video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Sikiliza ujumbe wa sauti kutoka kwa <xliff:g id="NAMEORNUMBER">^1</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 0deb23900..0b5a51d9f 100644
--- a/java/com/android/dialer/app/res/values-ta/strings.xml
+++ b/java/com/android/dialer/app/res/values-ta/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"அகற்று"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"வீடியோ அழைப்பு"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"செய்தி அனுப்பவும்"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"பகிர்ந்து அழை"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"அழைப்பு விவரங்கள்"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"இதற்கு அனுப்பு …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ஐ அழை"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"அழைத்த அழைப்பு: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> மூலமாக"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> மூலமாக <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> இல்"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"அழை"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ஐ அழை"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ஐ வீடியோவில் அழைக்கும்."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 88e81d254..512f7e276 100644
--- a/java/com/android/dialer/app/res/values-te/strings.xml
+++ b/java/com/android/dialer/app/res/values-te/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"తీసివేయి"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"వీడియో కాల్"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"సందేశాన్ని పంపు"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"భాగస్వామ్యం చేసి, కాల్ చేయి"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"కాల్ వివరాలు"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"దీనికి/వీటికి పంపు …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>కి కాల్ చేయి"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>కి <xliff:g id="TIMEOFCALL">^3</xliff:g> <xliff:g id="PHONEACCOUNT">^4</xliff:g> నుండి కాల్ చేసారు."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> ద్వారా"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> ద్వారా <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"కాల్ చేయి"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>కి కాల్ చేయి"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>కి వీడియో కాల్."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 d434a83db..6817d51b8 100644
--- a/java/com/android/dialer/app/res/values-th/strings.xml
+++ b/java/com/android/dialer/app/res/values-th/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"ลบ"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"แฮงเอาท์วิดีโอ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ส่งข้อความ"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"แชร์และโทร"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"รายละเอียดการโทร"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ส่งไปที่…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"โทรไปที่ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"โทรหา <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"ผ่าน <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ผ่าน <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"โทร"</string>
     <string name="description_call_action" msgid="4042796498169106545">"โทรไปที่ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"เรียกแฮงเอาท์วิดีโอไปยัง <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"ฟังข้อความเสียงจาก <xliff:g id="NAMEORNUMBER">^1</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 e0c270d7d..c98a04633 100644
--- a/java/com/android/dialer/app/res/values-tl/strings.xml
+++ b/java/com/android/dialer/app/res/values-tl/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Alisin"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Mag-video call"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Magpadala ng mensahe"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Ibahagi at tumawag"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Mga detalye ng tawag"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Ibahagi sa …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Tawagan ang/si <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Tawag kay/sa <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"sa pamamagitan ng <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> sa pamamagitan ng <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Tumawag"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Tawagan ang/si <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"I-video call si/ang <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Makinig sa voicemail mula sa/kay <xliff:g id="NAMEORNUMBER">^1</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 cd5e0695e..73b3cd729 100644
--- a/java/com/android/dialer/app/res/values-tr/strings.xml
+++ b/java/com/android/dialer/app/res/values-tr/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Kaldır"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video görüşmesi"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"İleti gönder"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Paylaş ve telefon et"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Çağrı ayrıntıları"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Gönder…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Telefon et: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Yapılan çağrı: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> kullanılarak"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> kullanılarak <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Telefon et"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Telefon et: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ile video görüşmesi yap."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Şu numaradan gelen sesli mesajı dinle: <xliff:g id="NAMEORNUMBER">^1</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 cdf0dc8db..dd7689093 100644
--- a/java/com/android/dialer/app/res/values-uk/strings.xml
+++ b/java/com/android/dialer/app/res/values-uk/strings.xml
@@ -146,7 +146,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Видалити"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Відеодзвінок"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Надіслати повідомлення"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Поділитися й зателефонувати"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Деталі виклику"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Надіслати в…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: телефонувати"</string>
@@ -157,7 +156,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Вихідний дзвінок: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"на номер <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> на номер <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Виклик"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Телефонувати: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Запросити контакт <xliff:g id="NAMEORNUMBER">^1</xliff:g> на відеодзвінок."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Слухати голосову пошту: <xliff:g id="NAMEORNUMBER">^1</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 1e6c0a392..534b915cc 100644
--- a/java/com/android/dialer/app/res/values-ur/strings.xml
+++ b/java/com/android/dialer/app/res/values-ur/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"ہٹائیں"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ویڈیو کال"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"پیغام بھیجیں"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"اشتراک کریں اور کال کریں"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"کال کی تفصیلات"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"بھیجیں بنام …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کو کال کریں"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g> پر کال کریں۔"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"بذریعہ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> بذریعہ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"کال کریں"</string>
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کو کال کریں"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کو ویڈیو کال کریں۔"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</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 9dcba7a11..d26c53cf4 100644
--- a/java/com/android/dialer/app/res/values-uz/strings.xml
+++ b/java/com/android/dialer/app/res/values-uz/strings.xml
@@ -35,10 +35,10 @@
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Barcha qo‘ng‘iroqlar tarixi o‘chib ketadi."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Qo‘ng‘iroqlar tarixi tozalanmoqda…"</string>
     <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Chaqiruv"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Javobsiz qo‘ng‘iroq"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Javobsiz ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Javobsiz qo‘ng‘iroqlar"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ta javobsiz qo‘ng‘iroq"</string>
+    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Javobsiz chaqiruv"</string>
+    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Javobsiz chaqiruv (ish)"</string>
+    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Javobsiz chaqiruvlar"</string>
+    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ta javobsiz chaqiruv"</string>
     <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Telefon"</string>
     <string name="notification_missedCall_message" msgid="5086910028988305964">"SMS yuborish"</string>
     <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
@@ -56,7 +56,7 @@
     <string name="call_log_voicemail_header" msgid="5799424860394542726">"Faqat ovozli xabar qo‘ng‘iroqlari"</string>
     <string name="call_log_incoming_header" msgid="1158753168119845168">"Faqat kiruvchi qo‘ng‘iroqlar"</string>
     <string name="call_log_outgoing_header" msgid="149333910997122683">"Faqat chiquvchi qo‘ng‘iroqlar"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Faqat javobsiz qo‘ng‘iroqlar"</string>
+    <string name="call_log_missed_header" msgid="6491707499211289630">"Faqat javobsiz chaqiruvlar"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="description_search_button" msgid="4515570469584782176">"qidiruv"</string>
     <string name="description_dial_button" msgid="699794433224646027">"terish"</string>
@@ -116,7 +116,7 @@
     <string name="block_number_search_hint" msgid="5377706079015099416">"Raqam qo‘shish yoki kontaktlardan qidirish"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Qo‘ng‘iroqlar tarixi bo‘m-bo‘sh"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Qo‘ng‘iroq qilish"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Sizda hech qanday javobsiz qo‘ng‘iroq yo‘q."</string>
+    <string name="call_log_missed_empty" msgid="7094936030845062214">"Hech qanday javobsiz chaqiruv yo‘q."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Sizning ovozli pochta qutingiz bo‘m-bo‘sh."</string>
     <string name="show_favorites_only" msgid="8089163582448737837">"Faqat saralar ko‘rsatilsin"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Chaqiruvlar tarixi"</string>
@@ -135,7 +135,7 @@
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS yuborish"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videoqo‘ng‘iroq qilish"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Raqamni bloklash"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> ta javobsiz qo‘ng‘iroq"</string>
+    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> ta javobsiz chaqiruv"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Tezkor raqam terish ro‘yxatida hech kim yo‘q"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Tezkor raqam terishni sozlang"</string>
     <string name="all_contacts_empty" msgid="243071567853617177">"Sizda hali hech qanday kontakt yo‘q"</string>
@@ -144,18 +144,16 @@
     <string name="remove_contact" msgid="2353580570488923668">"O‘chirish"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video qo‘ng‘iroq"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"SMS yuborish"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Ulashish va qo‘ng‘iroq qilish"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Chaqiruv tafsilotlari"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Yuborish:"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Qo‘ng‘iroq qilish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Qo‘ng‘iroq javobsiz qoldirildi: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
+    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Javobsiz chaqiruv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="description_incoming_answered_call" msgid="3920182963103160610">"Qo‘ng‘iroqqa javob berildi: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="description_unread_voicemail" msgid="145170985013419170">"O‘qilmagan ovozli xabar (<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)."</string>
     <string name="description_read_voicemail" msgid="5585559881573227732">"Ovozli xabar (<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)."</string>
     <string name="description_outgoing_call" msgid="543952487882919924">"Chaqiruv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>. <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami orqali"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> raqami orqali"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Qo‘ng‘iroq qilish"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Qo‘ng‘iroq qilish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Video qo‘ng‘iroq qilish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> kontaktidan kelgan ovozli xabarni tinglash"</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 2b1fc4f38..942f06768 100644
--- a/java/com/android/dialer/app/res/values-vi/strings.xml
+++ b/java/com/android/dialer/app/res/values-vi/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Xóa"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Cuộc gọi điện video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Gửi tin nhắn"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Chia sẻ và gọi"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Chi tiết cuộc gọi"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Gửi đến …"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Gọi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Gọi tới <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"qua <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> qua <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Gọi"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Gọi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Gọi điện video cho <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Nghe thư thoại từ <xliff:g id="NAMEORNUMBER">^1</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 cc66921d2..4b6f55a69 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
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"移除"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"视频通话"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"发送短信"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"分享并拨打电话"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"通话详情"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"发送至…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"呼叫<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="TIMEOFCALL">^3</xliff:g>通过 <xliff:g id="PHONEACCOUNT">^4</xliff:g> 拨打给<xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="TYPEORLOCATION">^2</xliff:g>）的电话。"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"通过 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"帐号：<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>，通过 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"拨打电话"</string>
     <string name="description_call_action" msgid="4042796498169106545">"呼叫<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"与<xliff:g id="NAMEORNUMBER">^1</xliff:g>进行视频通话。"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"听取来自<xliff:g id="NAMEORNUMBER">^1</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 46ca46caf..95dd23871 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
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"移除"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"視像通話"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"傳送訊息"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"分享並通話"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"通話詳情"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"傳送至…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"致電 <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"致電：<xliff:g id="NAMEORNUMBER">^1</xliff:g> (<xliff:g id="TIMEOFCALL">^3</xliff:g>，<xliff:g id="TYPEORLOCATION">^2</xliff:g><xliff:g id="PHONEACCOUNT">^4</xliff:g>)。"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"透過 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>，透過 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"撥號"</string>
     <string name="description_call_action" msgid="4042796498169106545">"致電 <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"與<xliff:g id="NAMEORNUMBER">^1</xliff:g>進行視像通話。"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"收聽來自「<xliff:g id="NAMEORNUMBER">^1</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 c9c9194c9..66d986d8c 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
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"移除"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"視訊通話"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"傳送簡訊"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"分享及撥號"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"通話詳細資料"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"傳送至…"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"撥號給「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"撥出通話：<xliff:g id="NAMEORNUMBER">^1</xliff:g>/<xliff:g id="TYPEORLOCATION">^2</xliff:g>/<xliff:g id="TIMEOFCALL">^3</xliff:g>/<xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"透過 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> (透過 <xliff:g id="NUMBER">%2$s</xliff:g>)"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"撥號"</string>
     <string name="description_call_action" msgid="4042796498169106545">"撥號給「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"與「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」視訊通話。"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"聽取「<xliff:g id="NAMEORNUMBER">^1</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 b73b25d9e..4cee09247 100644
--- a/java/com/android/dialer/app/res/values-zu/strings.xml
+++ b/java/com/android/dialer/app/res/values-zu/strings.xml
@@ -144,7 +144,6 @@
     <string name="remove_contact" msgid="2353580570488923668">"Susa"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Ikholi yevidiyo"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Thumela umlayezo"</string>
-    <string name="share_and_call" msgid="1208757302713705291">"Yabelana futhi ushaye"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Imininingwane yekholi"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Thumela ku ..."</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Shayela ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
@@ -155,7 +154,6 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Ikholi eya ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"nge-<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> nge-<xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_log_call_action" msgid="6958550749492392199">"Shaya"</string>
     <string name="description_call_action" msgid="4042796498169106545">"Shayela ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Ikholi yevidiyo ka-<xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Lalela ivoyisimeyili esuka ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml
index 66bf70f1a..9944f9ff2 100644
--- a/java/com/android/dialer/app/res/values/strings.xml
+++ b/java/com/android/dialer/app/res/values/strings.xml
@@ -527,11 +527,6 @@
        [CHAR LIMIT=30] -->
   <string name="call_log_action_send_message">Send a message</string>
 
-  <!-- Button text for a button displayed underneath an entry in the call log, which opens up the
-       call compose UI for the number represented by the call log entry.
-       [CHAR LIMIT=30] -->
-  <string name="share_and_call">Share and call</string>
-
   <!-- Button text for the button displayed underneath an entry in the call log.
        Tapping navigates the user to the call details screen where the user can view details for
        the call log entry. [CHAR LIMIT=30] -->
@@ -581,10 +576,6 @@
        [CHAR LIMIT=NONE]-->
   <string name="call_log_via_number_phone_account"><xliff:g example="SIM 1" id="phoneAccount">%1$s</xliff:g> via <xliff:g example="(555) 555-5555" id="number">%2$s</xliff:g></string>
 
-  <!-- String describing the phone icon on a call log list item. When tapped, it will place a
-       call to the number represented by that call log entry. [CHAR LIMIT=NONE]-->
-  <string name="description_call_log_call_action">Call</string>
-
   <!-- String describing the "call" action for an entry in the call log.  The call back
        action triggers a return call to the named user.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
diff --git a/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java b/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
index 190426e6e..b56d568b7 100644
--- a/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
@@ -160,7 +160,7 @@ public class OmtpVoicemailMessageCreator {
             voicemailClient,
             isVoicemailArchiveEnabled,
             context.getString(R.string.voicemail_error_inbox_full_turn_archive_on_title),
-            context.getString(R.string.voicemail_error_inbox_full_turn_archive_on_message),
+            context.getText(R.string.voicemail_error_inbox_full_turn_archive_on_message),
             context.getString(R.string.voicemail_error_inbox_full_title),
             context.getString(R.string.voicemail_error_inbox_full_message),
             VOICEMAIL_PROMO_DISMISSED_KEY);
@@ -176,7 +176,7 @@ public class OmtpVoicemailMessageCreator {
             voicemailClient,
             isVoicemailArchiveEnabled,
             context.getString(R.string.voicemail_error_inbox_almost_full_turn_archive_on_title),
-            context.getString(R.string.voicemail_error_inbox_almost_full_turn_archive_on_message),
+            context.getText(R.string.voicemail_error_inbox_almost_full_turn_archive_on_message),
             context.getString(R.string.voicemail_error_inbox_near_full_title),
             context.getString(R.string.voicemail_error_inbox_near_full_message),
             VOICEMAIL_PROMO_ALMOST_FULL_DISMISSED_KEY);
@@ -194,7 +194,7 @@ public class OmtpVoicemailMessageCreator {
       VoicemailClient voicemailClient,
       boolean isVoicemailArchiveEnabled,
       String promoTitle,
-      String promoMessage,
+      CharSequence promoMessage,
       String nonPromoTitle,
       String nonPromoMessage,
       String preferenceKey) {
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java
index b877a76b4..4addcb996 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java
@@ -226,7 +226,7 @@ public class VoicemailErrorMessage {
                 preferenceKeyToUpdate,
                 DialerImpression.Type.VVM_USER_DISMISSED_VM_FULL_PROMO,
                 DialerImpression.Type.VVM_USER_DISMISSED_VM_ALMOST_FULL_PROMO);
-            sharedPreferenceForAccount.edit().putBoolean(preferenceKeyToUpdate, true);
+            sharedPreferenceForAccount.edit().putBoolean(preferenceKeyToUpdate, true).apply();
             statusReader.refresh();
           }
         });
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java
index 7dc18f043..2048d4958 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.support.annotation.Nullable;
+import com.android.voicemail.VisualVoicemailTypeExtensions;
 
 /**
  * Given a VoicemailStatus, {@link VoicemailErrorMessageCreator#create(Context, VoicemailStatus)}
@@ -36,7 +37,7 @@ public class VoicemailErrorMessageCreator {
       return null;
     }
     switch (status.type) {
-      case Vvm3VoicemailMessageCreator.VVM_TYPE_VVM3:
+      case VisualVoicemailTypeExtensions.VVM_TYPE_VVM3:
         return Vvm3VoicemailMessageCreator.create(context, status, statusReader);
       default:
         return OmtpVoicemailMessageCreator.create(context, status, statusReader);
diff --git a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
index 356131bb3..8b10ff4a8 100644
--- a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
@@ -48,8 +48,6 @@ import java.util.Locale;
 @RequiresApi(VERSION_CODES.N_MR1)
 public class Vvm3VoicemailMessageCreator {
 
-  public static final String VVM_TYPE_VVM3 = "vvm_type_vvm3";
-
   // Copied from com.android.phone.vvm.omtp.protocol.Vvm3EventHandler
   // TODO(b/28380841): unbundle VVM client so we can access these values directly
   public static final int VMS_DNS_FAILURE = -9001;
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 9c64735af..8a6571fe6 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Jy sal nie nuwe stemboodskappe kan ontvang as jou inkassie vol is nie."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Kan nie nuwe stemboodskappe ontvang nie"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Jou inkassie is vol. Probeer \'n paar boodskappe uitvee om nuwe stemboodskappe te ontvang."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Skakel ekstra berging en rugsteun aan"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Jou posbus is vol. Om spasie beskikbaar te maak, skakel ekstra berging aan sodat Google jou stemboodskappe kan bestuur en rugsteun."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Skakel ekstra berging en rugsteun aan"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Jou posbus is amper vol. Om spasie beskikbaar te maak, skakel ekstra berging aan sodat Google jou stemboodskappe kan bestuur en rugsteun."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Stel jou stemboodskap-PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Jy sal \'n stemboodskap-PIN nodig hê wanneer jy ook al na jou stemboodskapdiens toe bel."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Onbekende fout"</string>
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 502b87304..ca49a8ccd 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"የገቢ መልዕክት ሳጥንዎ ሙሉ ከሆነ አዲስ የድምጽ መልዕክት መቀበል አይችሉም።"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"አዲስ የድምጽ መልዕክት መቀበል አይቻልም"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"የመልዕክት ሳጥንዎ ሙሉ ነው። አዲስ የድምጽ መልዕክት ለመቀበል የተወሰኑ መልዕክቶችን ለመሰረዝ ይሞክሩ።"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"ትርፍ ማከማቻ እና ምትኬን ያብሩ"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"የእርስዎ የመልእክት ሳጥን ሙሉ ነው። ባዶ ቦታ ነጻ ለማድረግ፣ Google የእርስዎን የድምፅ መልእክቶች ማስተዳደር እና በምትኬ ማስቀመጥ እንዲችል ትርፍ ማከማቻን ያብሩ።"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"ትርፍ ማከማቻ እና ምትኬን ያብሩ"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"የእርስዎ የመልእክት ሳጥን ሙሉ ነው። ባዶ ቦታ ነጻ ለማድረግ፣ Google የእርስዎን የድምፅ መልእክቶች ማስተዳደር እና በምትኬ ማስቀመጥ እንዲችል ትርፍ ማከማቻን ያብሩ።"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"የድምፅ መልዕክት ፒንዎን ያስገቡ"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"በማንኛውም ጊዜ የድምፅ መልዕክትዎ ላይ ለመድረስ ሲደውሉ የድምፅ መልዕክት ፒን ያስፈልግዎታል።"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"ያልታወቀ ስህተት"</string>
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 6d462ef41..b46df86df 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"لن تتمكن من تلقي بريد صوتي جديد إذا امتلأ بريدك الوارد."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"يتعذر تلقي رسائل بريد صوتي جديدة"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"بريدك الوارد ممتلئ. حاول حذف بعض الرسائل لتلقي رسائل بريد صوتي جديدة."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"تشغيل سعة التخزين الإضافية والنسخ الاحتياطي"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"‏صندوق بريدك ممتلئ. للحصول على بعض المساحة، ينبغي تشغيل سعة التخزين الإضافية حتى يتمكن Google من إدارة رسائل البريد الصوتي ونسخها احتياطيًا."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"تشغيل سعة التخزين الإضافية والنسخ الاحتياطي"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"‏صندوق بريدك ممتلئ. للحصول على بعض المساحة، ينبغي تشغيل سعة التخزين الإضافية حتى يتمكن Google من إدارة رسائل البريد الصوتي ونسخها احتياطيًا."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"إعداد رقم التعريف الشخصي للبريد الصوتي"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ستحتاج رقم تعريف شخصي للبريد الصوتي في كل مرة تتصل فيها للوصول إلى بريدك الصوتي."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"حدث خطأ غير معروف"</string>
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 33ddafa0a..556d549e6 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Gələnlər qutusu dolu olduqda, yeni səsli mesaj almaq olmayacaq."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Yeni səsli mesaj almaq olmur"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Gələnlər qutusu doludur. Yeni səsli mesaj əldə etmək üçün bəzi mesajları silin."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Əlavə yaddaş və yedəkləməni aktiv edin"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"E-poçt qutusu doludur. Boş yer yaratmaq üçün əlavə yaddaşı aktiv edin, beləliklə Google səsli e-məktub mesajlarını idarə edə və yedəkləyə bilər."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Əlavə yaddaş və yedəkləməni aktiv edin"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"E-poçt qutusu artıq doludur. Boş yer yaratmaq üçün əlavə yaddaşı aktiv edin, beləliklə Google səsli e-məktub mesajlarını idarə edə və yedəkləyə bilər."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Səsli mesaj PIN kodunu ayarlayın"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Zəng etdiyiniz zaman səsli mesaja daxil olmaq üçün PIN koda ehtiyacınız olacaq."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Naməlum xəta"</string>
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 50f32af4f..d5f582f06 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Вы не зможаце атрымліваць новыя галасавыя паведамленні, калі ваша папка ўваходных поўная."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Немагчыма атрымліваць новыя галасавыя паведамленні"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Ваша папка ўваходных запоўнена. Паспрабуйце выдаліць некалькі паведамленняў, каб атрымаць новую галасавую пошту."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Уключыць дадатковае сховішча і рэзервовае капіраванне"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Ваша паштовая скрыня запоўнена. Каб вызваліць месца, уключыце дадатковае сховішча, каб Google мог кіраваць вашымі паведамленнямі галасавой пошты і рабіць іх рэзервовую копію."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Уключыць дадатковае сховішча і рэзервовае капіраванне"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Ваша паштовая скрыня амаль запоўнена. Каб вызваліць месца, уключыце дадатковае сховішча, каб Google мог кіраваць вашымі паведамленнямі галасавой пошты і рабіць іх рэзервовую копію."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Наладзьце PIN-код галасавой пошты"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Вам спатрэбіцца PIN-код галасавой пошты заўжды, калі вы тэлефануеце на сваю галасавую пошту."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Невядомая памылка"</string>
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 dbca19ea2..be1d3f048 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Няма да можете да получавате нова гласова поща, ако входящата ви поща е пълна."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Не могат да се получават нови гласови съобщения"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Входящата ви поща е пълна. Опитайте да изтриете съобщения, за да получавате нова гласова поща."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Включване на допълнително хранилище и създаване на резервно копие"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Пощенската ви кутия е пълна. За да освободите място, включете допълнително хранилище, така че Google да може да управлява и създаде резервно копие на съобщенията в гласовата ви поща."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Включване на допълнително хранилище и създаване на резервно копие"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Пощенската ви кутия е почти пълна. За да освободите място, включете допълнително хранилище, така че Google да може да управлява и създаде резервно копие на съобщенията в гласовата ви поща."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Задайте ПИН за гласовата си поща"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Ще ви е необходим ПИН за гласовата поща при всяко обаждане за достъп до съобщенията ви в нея."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Неизвестна грешка"</string>
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 5954448ee..3a6959578 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"যদি আপনার ইনবক্সে পূর্ণ থাকে তাহলে আপনি নতুন ভয়েসমেল পেতে সক্ষম হবেন না।"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"নতুন ভয়েসমেলগুলি গ্রহণ করতে পারবেন না"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"আপনার ইনবক্স পূর্ণ। নতুন ভয়েসমেল পেতে কিছু বার্তা মুছে ফেলার চেষ্টা করুন।"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"অতিরিক্ত সঞ্চয়স্থান এবং ব্যাক আপ চালু করুন"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"আপনার মেলবক্স পূর্ণ। স্থান খালি করতে, অতিরিক্ত সঞ্চয়স্থান চালু করুন যাতে Google আপনার ভয়েসমেল বার্তাগুলি পরিচালনা করতে এবং ব্যাক আপ নিতে পারে।"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"অতিরিক্ত সঞ্চয়স্থান এবং ব্যাক আপ চালু করুন"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"আপনার মেলবক্স প্রায় পূর্ণ। স্থান খালি করতে, অতিরিক্ত সঞ্চয়স্থান চালু করুন যাতে Google আপনার ভয়েসমেল বার্তাগুলি পরিচালনা করতে এবং ব্যাক আপ নিতে পারে।"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"আপনার ভয়েসমেল পিন সেট করুন"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"যে কোনো সময়ে আপনার ভয়েসমেল অ্যাক্সেস করার জন্য আপনার একটি ভয়েসমেল পিন প্রয়োজন৷"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"অজানা ত্রুটি"</string>
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 0352436c4..e3d01b0a7 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Nećete moći primati novu govornu poštu ako je vam je pristigla pošta puna."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Ne možete primati novu govornu poštu"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Vaša pristigla pošta je puna. Pokušajte izbrisati neke poruke da primite novu govornu poštu."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Uključite dodatnu pohranu i sigurnosnu kopiju"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Poštanski pretinac je pun. Da oslobodite prostor, uključite dodatnu pohranu tako da Google može upravljati vašim porukama govorne pošte i praviti njihovu sigurnosnu kopiju."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Uključite dodatnu pohranu i sigurnosnu kopiju"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Poštanski pretinac je gotovo sasvim pun. Da oslobodite prostor, uključite dodatnu pohranu tako da Google može upravljati vašim porukama govorne pošte i praviti njihovu sigurnosnu kopiju."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Postavite PIN za govornu poštu"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN za govornu poštu trebat će vam svaki put kada zatražite pristup govornoj pošti."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nepoznata greška"</string>
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 b6d844df8..c8c734d51 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"No podràs rebre missatges de veu nous si la safata d\'entrada està plena."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"No es poden rebre missatges de veu nous"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"La safata d\'entrada està plena. Per rebre missatges de veu nous, prova de suprimir alguns missatges."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Activa l\'emmagatzematge addicional i la còpia de seguretat"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Tens la bústia plena. Per alliberar espai, activa l\'emmagatzematge addicional perquè Google pugui gestionar els missatges de veu i crear-ne una còpia de seguretat."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Activa l\'emmagatzematge addicional i la còpia de seguretat"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Tens la bústia gairebé plena. Per alliberar espai, activa l\'emmagatzematge addicional perquè Google pugui gestionar els missatges de veu i crear-ne una còpia de seguretat."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Defineix el PIN per als missatges de veu"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Necessitaràs el PIN per als missatges de veu cada vegada que truquis per accedir-hi."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Error desconegut"</string>
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 c52f7b007..c082bd2f2 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Pokud máte plnou schránku, nemůžete přijímat nové hlasové zprávy."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Nemůžete přijímat nové hlasové zprávy"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Vaše schránka je plná. Abyste mohli přijímat nové hlasové zprávy, zkuste nějaké zprávy smazat."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Zapněte si další úložiště a zálohování"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Vaše e-mailová schránka je plná. Pokud chcete uvolnit místo, zapněte si další úložiště, aby Google mohl spravovat a zálohovat vaše hlasové zprávy."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Zapněte si další úložiště a zálohování"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Vaše e-mailová schránka je téměř plná. Pokud chcete uvolnit místo, zapněte si další úložiště, aby Google mohl spravovat a zálohovat vaše hlasové zprávy."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Nastavit kód PIN hlasové schránky"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN hlasové schránky budete potřebovat, kdykoli do své hlasové schránky zavoláte."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Neznámá chyba"</string>
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 26e5ede7c..cc1b40191 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Du vil ikke kunne modtage nye telefonsvarerbeskeder, hvis din indbakke er fuld."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Du kan ikke modtage nye telefonsvarerbeskeder"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Din indbakke er fuld. Prøv at slette nogle beskeder for at modtage nye telefonsvarerbeskeder."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Slå ekstra lagerplads og sikkerhedskopiering til"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Din telefonsvarer er fuld. Du kan frigøre plads ved at slå ekstra lagerplads til, så Google kan administrere og sikkerhedskopiere dine talebeskeder."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Slå ekstra lagerplads og sikkerhedskopiering til"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Din telefonsvarer er næsten fuld. Du kan frigøre plads ved at slå ekstra lagerplads til, så Google kan administrere og sikkerhedskopiere dine talebeskeder."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Bestem pinkoden til din telefonsvarer"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Du skal bruge en pinkode til din telefonsvarer, når du ringer for at få adgang til den."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Ukendt fejl"</string>
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 d3bfdcd6f..1f0e7020c 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Wenn deine Mailbox voll ist, kannst du keine neuen Sprachnachrichten empfangen."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Es können keine neuen Mailbox-Nachrichten empfangen werden"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Deine Mailbox ist voll. Lösche einige Nachrichten, um neue empfangen zu können."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Zusätzlichen Speicher und Sicherung aktivieren"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Dein Postfach ist voll. Aktivere zusätzlichen Speicher, um Speicherplatz freizugeben. So kann Google deine Mailbox-Nachrichten verwalten und sichern."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Zusätzlichen Speicher und Sicherung aktivieren"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Dein Postfach fast ist voll. Aktivere zusätzlichen Speicher, um Speicherplatz freizugeben. So kann Google deine Mailbox-Nachrichten verwalten und sichern."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Mailbox-PIN festlegen"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Bei jedem Anruf auf deiner Mailbox benötigst du eine Mailbox-PIN."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Unbekannter Fehler"</string>
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 acd1ca0e7..33a17fee5 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Δεν θα είστε σε θέση να λάβετε νέα φωνητικά μηνύματα από τον αυτόματο τηλεφωνητή εάν τα εισερχόμενά σας είναι πλήρη."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Δεν μπορείτε να λάβετε νέα μηνύματα από τον αυτόματο τηλεφωνητή"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Τα εισερχόμενά σας είναι πλήρη. Δοκιμάστε να διαγράψετε μερικά μηνύματα, για να λάβετε νέα μηνύματα από τον αυτόματο τηλεφωνητή."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Ενεργοποίηση επιπλέον αποθηκευτικού χώρου και αντιγράφων ασφαλείας"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Το γραμματοκιβώτιό σας είναι πλήρες. Για να ελευθερώσετε χώρο, ενεργοποιήστε επιπλέον αποθηκευτικό χώρο, ώστε η Google μπορεί να διαχειριστεί και να δημιουργήσει αντίγραφα ασφαλείας των μηνυμάτων του αυτόματου τηλεφωνητή σας."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Ενεργοποίηση επιπλέον αποθηκευτικού χώρου και αντιγράφων ασφαλείας"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Το γραμματοκιβώτιό σας είναι σχεδόν πλήρες. Για να ελευθερώσετε χώρο, ενεργοποιήστε επιπλέον αποθηκευτικό χώρο, ώστε η Google μπορεί να διαχειριστεί και να δημιουργήσει αντίγραφα ασφαλείας των μηνυμάτων του αυτόματου τηλεφωνητή σας."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ορίστε PIN για τον αυτόματο τηλεφωνητή σας"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Θα χρειάζεστε ένα PIN φωνητικού τηλεφωνητή κάθε φορά που καλείτε, για να έχετε πρόσβαση στον τηλεφωνητή σας."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Άγνωστο σφάλμα"</string>
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 a036950a6..28117ea47 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"You won\'t be able to receive new voicemail if your inbox is full."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Can\'t receive new voicemail"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Your inbox is full. Try deleting some messages to receive new voicemail."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Turn on extra storage and backup"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Your mailbox is full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Turn on extra storage and backup"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Set your voicemail PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"You\'ll need a voicemail PIN whenever you call to access your voicemail."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Unknown error"</string>
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 a036950a6..28117ea47 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"You won\'t be able to receive new voicemail if your inbox is full."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Can\'t receive new voicemail"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Your inbox is full. Try deleting some messages to receive new voicemail."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Turn on extra storage and backup"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Your mailbox is full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Turn on extra storage and backup"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Set your voicemail PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"You\'ll need a voicemail PIN whenever you call to access your voicemail."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Unknown error"</string>
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 a036950a6..28117ea47 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"You won\'t be able to receive new voicemail if your inbox is full."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Can\'t receive new voicemail"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Your inbox is full. Try deleting some messages to receive new voicemail."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Turn on extra storage and backup"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Your mailbox is full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Turn on extra storage and backup"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Set your voicemail PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"You\'ll need a voicemail PIN whenever you call to access your voicemail."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Unknown error"</string>
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 485a78b10..f7a51a866 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Si la carpeta Recibidos está llena, no podrás recibir mensajes de voz nuevos."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"No se pueden recibir mensajes de voz nuevos"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"La carpeta Recibidos está llena. Intenta borrar algunos mensajes para recibir mensajes de voz nuevos."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Activar la copia de seguridad y obtener almacenamiento adicional"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Tu buzón está lleno. Para liberar espacio, obtén almacenamiento adicional para que Google pueda administrar tus mensajes de voz y hacer copias de seguridad de ellos."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Activar la copia de seguridad y obtener almacenamiento adicional"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Tu buzón está casi lleno. Para liberar espacio, obtén almacenamiento adicional para que Google pueda administrar tus mensajes de voz y hacer copias de seguridad de ellos."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Configura el PIN del buzón de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Necesitas un PIN cada vez que llames para acceder al buzón de voz."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Error desconocido"</string>
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 d351f375c..5d799504a 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Si la bandeja de entrada está llena, no podrás recibir los mensajes de voz nuevos."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"No puedes recibir los mensajes de voz nuevos"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Tienes la bandeja de entrada llena. Para recibir nuevos mensajes de voz, prueba a eliminar algunos antiguos."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Habilitar más espacio de almacenamiento y de copia de seguridad"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Tu buzón de voz está lleno. Para desocupar espacio, habilita más almacenamiento para que Google pueda hacer una copia de seguridad de tus mensajes del buzón de buzón y gestionarlos."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Habilitar más espacio de almacenamiento y de copia de seguridad"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Tu buzón de voz está prácticamente lleno. Para desocupar espacio, habilita más almacenamiento para que Google pueda hacer una copia de seguridad de tus mensajes del buzón de buzón y gestionarlos."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Configura el PIN del buzón de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Deberás introducir un PIN del buzón de voz siempre que llames para escuchar los mensajes de voz."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Error desconocido"</string>
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 e392f9067..2960acee6 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Kui teie postkast on täis, ei saa te uusi kõnepostisõnumeid vastu võtta."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Uusi kõnepostisõnumeid ei saa vastu võtta"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Teie postkast on täis. Uute kõnepostisõnumite vastuvõtmiseks kustutage mõned sõnumid."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Lisasalvestusruumi ja varundamise sisselülitamine"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Teie postkast on täis. Ruumi vabastamiseks lülitage sisse lisasalvestusruum, et Google saaks teie kõnepostisõnumeid hallata ja varundada."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Lisasalvestusruumi ja varundamise sisselülitamine"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Teie postkast on peaaegu täis. Ruumi vabastamiseks lülitage sisse lisasalvestusruum, et Google saaks teie kõnepostisõnumeid hallata ja varundada."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Määrake kõneposti PIN-kood"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Vajate PIN-koodi juhul, kui helistate kõnepostile juurdepääsemiseks."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Tundmatu viga"</string>
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 af40192d2..055c40a64 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Ezin izango duzu jaso ahots-mezu berririk sarrera-ontzia beteta badago."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Ezin da jaso ahots-mezu berririk"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Beteta dago sarrera-ontzia. Ezabatu mezu batzuk ahots-mezu berriak jasotzeko."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Lortu biltegiratze-toki gehiago eta egin babeskopiak"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Beteta dago postontzia. Tokia egiteko, lortu biltegiratze-toki gehiago, Google-k erantzungailuko mezuak kudeatu eta haien babeskopiak egin ahal izan ditzan."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Lortu biltegiratze-toki gehiago eta egin babeskopiak"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Ia beteta dago postontzia. Tokia egiteko, lortu biltegiratze-toki gehiago, Google-k erantzungailuko mezuak kudeatu eta haien babeskopiak egin ahal izan ditzan."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ezarri erantzungailuko PIN kodea"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Erantzungailua atzitzeko deitzen duzunerako behar duzu PIN kodea."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Errore ezezagun bat gertatu da"</string>
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 af79322bb..1d3caa7de 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"اگر صندوق ورودی‌تان پر باشد نمی‌توانید پست صوتی جدیدی دریافت کنید."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"پست‌های صوتی جدید دریافت نمی‌شود"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"صندوق ورودی‌تان پر است. بعضی از پیام‌ها را حذف کنید تا پست صوتی جدید دریافت کنید."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"فعال‌سازی فضای ذخیره‌سازی اضافی و پشتیبان‌گیری"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"‏صندوق ورودی‌تان پر است. برای آزاد کردن فضا، فضای ذخیره‌سازی اضافی را فعال‌سازی کنید تا Google بتواند پیام‌های صندوق پستی‌تان را مدیریت و پشتیبان‌گیری کند."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"فعال‌سازی فضای ذخیره‌سازی اضافی و پشتیبان‌گیری"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"‏صندوق ورودی‌تان تقریباً پر است. برای آزاد کردن فضا، فضای ذخیره‌سازی اضافی را فعال‌سازی کنید تا Google بتواند پیام‌های صندوق پستی‌تان را مدیریت و پشتیبان‌گیری کند."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"تنظیم پین پست صوتی"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"هر بار که تماس می‌گیرید برای دسترسی به پست صوتی‌تان به پین پست صوتی نیاز دارید."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"خطای ناشناس"</string>
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 54167659b..4a994c80a 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Uusia vastaajaviestejä ei voi vastaanottaa, jos postilaatikko on täynnä."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Uusien vastaajaviestien vastaanottaminen ei onnistu."</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Postilaatikkosi on täynnä. Poista viestejä, jotta voit vastaanottaa uusia vastaajaviestejä."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Ota käyttöön lisätallennustila ja ‑varmuuskopiointi"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Postilaatikkosi on täynnä. Jos haluat vapauttaa tilaa, ota käyttöön lisätallennustila, niin Google voi hallinnoida ja varmuuskopioida vastaajaviestisi."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Ota käyttöön lisätallennustila ja ‑varmuuskopiointi"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Postilaatikkosi on lähes täynnä. Jos haluat vapauttaa tilaa, ota käyttöön lisätallennustila, niin Google voi hallinnoida ja varmuuskopioida vastaajaviestisi."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Aseta vastaajan PIN-koodi"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Vastaajan PIN-koodi on annettava aina, kun käytät vastaajaa."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Tuntematon virhe"</string>
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 ef88ecfa2..9d8259249 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Vous ne pourrez pas recevoir de nouveaux messages vocaux si votre boîte de réception est pleine."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Impossible de recevoir de nouveaux messages vocaux"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Votre boîte de réception est pleine. Essayez de supprimer des messages pour pouvoir recevoir de nouveaux messages vocaux."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Activer l\'espace supplémentaire de stockage et de sauvegarde"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Votre boîte aux lettres est pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire pour que Google puisse gérer et sauvegarder vos messages vocaux."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Activer l\'espace supplémentaire de stockage et de sauvegarde"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Votre boîte aux lettres est presque pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire pour que Google puisse gérer et sauvegarder vos messages vocaux."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Définir votre NIP de messagerie vocale"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Vous devez saisir un NIP de messagerie vocale chaque fois que vous appelez pour accéder à vos messages vocaux."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Erreur inconnue"</string>
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 eefd5ad24..595979474 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Vous ne pouvez pas recevoir de nouveaux messages vocaux si votre boîte de réception est pleine."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Impossible de recevoir de nouveaux messages vocaux"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Votre boîte de réception est pleine. Supprimez des messages vocaux pour pouvoir en recevoir de nouveaux."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Activer l\'espace de stockage et de sauvegarde supplémentaire"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Votre boîte aux lettres est pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire. Google pourra ainsi gérer vos messages vocaux et les sauvegarder."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Activer l\'espace de stockage et de sauvegarde supplémentaire"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Votre boîte aux lettres est presque pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire. Google pourra ainsi gérer vos messages vocaux et les sauvegarder."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Définir le code de votre messagerie vocale"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Vous devrez saisir ce code chaque fois que vous consulterez votre messagerie vocale."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Erreur inconnue"</string>
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 efd174ffb..27efdbe26 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Non poderás recibir correo de voz novo se a caixa de entrada está chea."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Non se poden recibir correos de voz novos"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"A caixa de entrada está chea. Proba a eliminar algunhas mensaxes para recibir correo de voz novo."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Activa o almacenamento adicional e a copia de seguranza"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"A túa caixa de correo está chea. Para liberar espazo, activa o almacenamento adicional, de modo que Google poida xestionar as túas mensaxes do correo de voz e facer unha copia de seguranza."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Activa o almacenamento adicional e a copia de seguranza"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"A túa caixa de correo está case chea. Para liberar espazo, activa o almacenamento adicional, de modo que Google poida xestionar as túas mensaxes do correo de voz e facer unha copia de seguranza."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Establece o PIN para o teu correo de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Necesitarás o PIN cada vez que chames para acceder ao teu correo de voz."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Produciuse un erro descoñecido"</string>
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 44634437a..b0fbdd752 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"જો તમારું ઇનબોક્સ ભરાઈ ગયું હોય તો તમે નવી વૉઇસમેઇલ પ્રાપ્ત કરી શકશો નહીં."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"નવી વૉઇસમેઇલ્સ પ્રાપ્ત કરી શકતાંં નથી"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"તમારું ઇનબોક્સ ભરાઈ ગયું છે. નવી વૉઇસમેઇલ પ્રાપ્ત કરવા માટે કેટલા સંદેશા કાઢી નાખવાનો પ્રયાસ કરો."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"અતિરિક્ત સ્ટોરેજ ચાલુ કરો અને બેકઅપ લો"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"તમારું મેઇલબોક્સ ભરાઇ ગયું છે. સ્થાન ખાલી કરવા માટે, અતિરિક્ત સ્ટોરેજ ખાલી કરો જેથી Google તમારા વૉઇસમેઇલ સંદેશા સંચાલિત કરી અને તેનું બેકઅપ લઈ શકે."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"અતિરિક્ત સ્ટોરેજ ચાલુ કરો અને બેકઅપ લો"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"તમારું મેઇલબોક્સ મોટાંભાગે ભરાઇ ગયું છે. સ્થાન ખાલી કરવા માટે, અતિરિક્ત સ્ટોરેજ ખાલી કરો જેથી Google તમારા વૉઇસમેઇલ સંદેશા સંચાલિત કરી અને તેનું બેકઅપ લઈ શકે."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"તમારો વૉઇસમેઇલ PIN સેટ કરો"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"તમારી વૉઇસમેઇલને ઍક્સેસ કરવા માટે તમે કોઈપણ સમયે કૉલ કરો છો, ત્યારે તમને વૉઇસમેઇલ PIN ની જરૂર પડશે."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"અજાણી ભૂલ"</string>
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 bc9c46331..00246d9ca 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"यदि आपका इनबॉक्स भरा हुआ है, तो आप नया वॉइसमेल नहीं प्राप्त कर सकेंगे."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"नए वॉइसमेल प्राप्त नहीं किए जा सकते"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"आपका इनबॉक्स पूरा भर गया है. नया वॉइसमेल प्राप्त करने के लिए कुछ संदेश हटाने का प्रयास करें."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"अतिरिक्त जगह और बैकअप चालू करें"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"आपका मेलबॉक्स भर गया है. जगह खाली करने के लिए, अतिरिक्त जगह चालू करें ताकि Google आपके वॉइसमेल संदेशों को प्रबंधित कर सके और उनका बैकअप ले सके."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"अतिरिक्त जगह और बैकअप चालू करें"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"आपका मेलबॉक्स लगभग भर गया है. जगह खाली करने के लिए, अतिरिक्त जगह चालू करें ताकि Google आपके वॉइसमेल संदेशों को प्रबंधित कर सके और उनका बैकअप ले सके."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"अपना वॉइसमेल पिन सेट करें"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"आप जब भी अपना वॉइसमेल एक्सेस करने के लिए कॉल करते हैं, आपको वॉइसमेल पिन की आवश्यकता होगी."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"अज्ञात गड़बड़ी"</string>
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 a310d597c..b3e12efec 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Ako je vaša pristigla pošta puna, nećete moći primiti novu govornu poruku."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Primanje nove govorne pošte nije moguće"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Pristigla pošta je puna. Izbrišite neke poruke da biste primili novu govornu poštu."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Uključivanje dodatne pohrane i sigurnosnog kopiranja"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Vaš je poštanski pretinac pun. Da biste oslobodili prostor, uključite dodatnu pohranu tako da Google može upravljati porukama u govornoj pošti i sigurnosno ih kopirati."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Uključivanje dodatne pohrane i sigurnosnog kopiranja"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Vaš je poštanski pretinac gotovo pun. Da biste oslobodili prostor, uključite dodatnu pohranu tako da Google može upravljati porukama u govornoj pošti i sigurnosno ih kopirati."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Postavljanje PIN-a za govornu poštu"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN za govornu poštu trebat će vam svaki put kad zatražite pristup govornoj pošti."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nepoznata pogreška"</string>
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 cc3eb7ecf..6d1961282 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Ha a postaláda megtelt, nem fogadhat új hangpostaüzeneteket."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Nem tud új hangpostaüzeneteket fogadni"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"A postaláda megtelt. Ha meg szeretné kapni az új hangpostaüzeneteket, töröljön néhány üzenetet."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Az extra tárhely és biztonsági mentés bekapcsolása"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"A postaláda betelt. Ha szeretne helyet felszabadítani, kapcsolja be az extra tárhely funkciót, hogy a Google kezelhesse a hangpostaüzeneteket, és biztonsági mentést készíthessen róluk."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Az extra tárhely és biztonsági mentés bekapcsolása"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"A postaláda majdnem betelt. Ha szeretne helyet felszabadítani, kapcsolja be az extra tárhely funkciót, hogy a Google kezelhesse a hangpostaüzeneteket, és biztonsági mentést készíthessen róluk."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"A hangposta PIN-kódjának beállítása"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"A hangpostafiók eléréséhez PIN-kódra van szüksége."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Ismeretlen hiba"</string>
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 4a9c2ed21..4010b19b2 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Եթե մուտքի արկղը լցվի, նոր ձայնային հաղորդագրություններ չեք կարողանա ստանալ:"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Հնարավոր չէ ստանալ նոր ձայնային հաղորդագրություններ"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Մուտքի արկղը լիքն է: Նոր հաղոդագրություններ ստանալու համար ջնջեք հները:"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Պահանջվում է լրացուցիչ տարածք"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Ձեր փոստարկղը լիքն է: Ակտիվացրեք լրացուցիչ տարածք, որպեսզի Google-ը կարողանա կառավարել և պահուստավորել ձեր ձայնային փոստի հաղորդագրությունները:"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Պահանջվում է լրացուցիչ տարածք"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Ձեր փոստարկղը գրեթե լիքն է: Ակտիվացրեք լրացուցիչ տարածք, որպեսզի Google-ը կարողանա կառավարել և պահուստավորել ձեր ձայնային փոստի հաղորդագրությունները:"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ընտրել ձեր ձայնային փոստի PIN-ը"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Ամեն անգամ ձայնային փոստին զանգելիս ձեզանից կպահանջվի ձայնային փոստի PIN-ը:"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Անհայտ սխալ"</string>
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 948afaed4..ae272f975 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Pesan suara tidak dapat diterima jika kotak masuk Anda penuh."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Tidak dapat menerima pesan suara baru"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Kotak masuk Anda penuh. Coba hapus beberapa pesan untuk menerima pesan suara baru."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Aktifkan penyimpanan dan backup ekstra"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Kotak surat Anda sudah penuh. Untuk mengosongkan ruang, aktifkan penyimpanan ekstra sehingga Google dapat mengelola dan melakukan backup pada pesan suara Anda."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Aktifkan penyimpanan dan backup ekstra"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Kotak surat Anda hampir penuh. Untuk mengosongkan ruang, aktifkan penyimpanan ekstra sehingga Google dapat mengelola dan melakukan backup pada pesan suara Anda."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Setel PIN pesan suara Anda"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Anda akan memerlukan PIN pesan suara setiap kali menelepon untuk mengakses pesan suara."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Kesalahan tidak dikenal"</string>
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 ae0497ee3..06c249817 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Þú getur ekki tekið á móti nýjum talhólfsskilaboðum ef pósthólfið er fullt."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Ekki hægt að taka á móti nýjum talhólfsskilaboðum"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Pósthólfið er fullt. Prófaðu að eyða skilaboðum til að taka á móti nýjum talhólfsskilaboðum."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Kveikja á viðbótargeymslu og öryggisafritun"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Pósthólfið þitt er fullt. Þú getur losað pláss með því að kveikja á viðbótargeymslu til að Google geti unnið með og tekið öryggisafrit af talhólfsskilaboðunum þínum."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Kveikja á viðbótargeymslu og öryggisafritun"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Pósthólfið þitt er næstum fullt. Þú getur losað pláss með því að kveikja á viðbótargeymslu til að Google geti unnið með og tekið öryggisafrit af talhólfsskilaboðunum þínum."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Stilla PIN-númer talhólfs"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Þú þarft að nota PIN-númer talhólfsins í hvert skipti sem þú hringir til að athuga það."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Óþekkt villa"</string>
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 1df608aed..c66e6e456 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Se la casella della segreteria è piena non potrai ricevere nuovi messaggi vocali."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Impossibile ricevere nuovi messaggi vocali"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"La casella della segreteria è piena. Prova a eliminare alcuni messaggi per riceverne di nuovi."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Attiva spazio di archiviazione supplementare e backup"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"La tua casella di posta e piena. Per liberare spazio, attiva lo spazio di archiviazione supplementare in modo che Google possa gestire i messaggi vocali ed eseguirne il backup."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Attiva spazio di archiviazione supplementare e backup"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"La tua casella di posta e quasi piena. Per liberare spazio, attiva lo spazio di archiviazione supplementare in modo che Google possa gestire i messaggi vocali ed eseguirne il backup."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Imposta il PIN della segreteria"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Dovrai inserire il PIN della segreteria ogni volta che chiami per accedervi."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Errore sconosciuto"</string>
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 c05a02feb..f1a0ea2d1 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"אם תיבת הדואר הנכנס מלאה, לא תוכל לקבל דואר קולי חדש."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"לא ניתן לקבל הודעות חדשות בדואר הקולי"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"תיבת הדואר הנכנס מלאה. נסה למחוק חלק מההודעות כדי שתוכל לקבל דואר קולי חדש."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"הפעל את הגיבוי ופינוי המקום"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"‏תיבת הדואר שלך מלאה. הפעל את הגיבוי ופינוי המקום כדי ש-Google תוכל לנהל ולגבות את ההודעות הקוליות שלך."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"הפעל את הגיבוי ופינוי המקום"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"‏תיבת הדואר שלך כמעט מלאה. הפעל את הגיבוי ופינוי המקום כדי ש-Google תוכל לנהל ולגבות את ההודעות הקוליות שלך."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"הגדר קוד גישה לדואר הקולי"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"בכל פעם שתשתמש בדואר הקולי תצטרך את קוד הגישה."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"שגיאה לא ידועה"</string>
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 5d47a9cea..db40c9b91 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"新しいボイスメールを受信できません。受信トレイがいっぱいです。"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"新しいボイスメールを受信できません"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"受信トレイがいっぱいです。新しいボイスメールを受信するには、古いメッセージをいくつか削除してみてください。"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"追加の保存容量とバックアップを ON にしてください"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"メールボックスの保存容量が上限に達しました。空き容量を増やすには、追加の保存容量を ON にして、Google がボイスメールのメッセージの管理とバックアップを行えるようにしてください。"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"追加の保存容量とバックアップを ON にしてください"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"メールボックスの保存容量がもう少しで上限に達します。空き容量を増やすには、追加の保存容量を ON にして、Google がボイスメールのメッセージの管理とバックアップを行えるようにしてください。"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ボイスメール PIN を設定"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ボイスメールを呼び出すには、ボイスメール PIN が必要です。"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"不明なエラー"</string>
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 c5f6a12ca..f05ca5ea2 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"თუ თქვენი შემოსულები სავსეა, ახალ ხმოვან ფოსტას ვერ მიიღებთ."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"ახალი ხმოვანი ფოსტის მიღება შეუძლებელია"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"თქვენი შემოსულები სავსეა. ახალი ხმოვანი ფოსტის მისაღებად სცადეთ რამდენიმე შეტყობინების წაშლა."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"დამატებითი მეხსიერების ჩართვა და სარეზერვო ასლების შექმნა"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"თქვენი საფოსტო ყუთი სავსეა. ადგილის გასათავისუფლებლად ჩართეთ დამატებითი მეხსიერება, რათა Google-მა შეძლოს თქვენი ხმოვანი ფოსტის შეტყობინებების მართვა და სარეზერვო ასლების შექმნა."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"დამატებითი მეხსიერების ჩართვა და სარეზერვო ასლების შექმნა"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"თქვენი საფოსტო ყუთი თითქმის სავსეა. ადგილის გასათავისუფლებლად ჩართეთ დამატებითი მეხსიერება, რათა Google-მა შეძლოს თქვენი ხმოვანი ფოსტის შეტყობინებების მართვა და სარეზერვო ასლების შექმნა."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"დააყენეთ თქვენი ხმოვანი ფოსტის PIN-კოდი"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ნებისმიერ დროს, როდესაც დარეკავთ, რათა ხმოვან ფოსტაზე წვდომა იქონიოთ, ხმოვანი ფოსტის PIN-კოდი დაგჭირდებათ."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"უცნობი შეცდომა"</string>
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 ad164c8fa..66b051f03 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Кіріс қалтасы толы болса, жаңа дауыстық хабар ала алмайсыз."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Жаңа дауыстық хабарды алу мүмкін емес"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Кіріс қалтасы толы. Жаңа дауыстық хабарды алу үшін кейбір хабарларды жойып көріңіз."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Қосымша жадты қосып, сақтық көшірме жасау"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Кіріс жәшігі толы. Орын босату үшін, қосымша жад функциясын қосып, Google-ға дауыстық хабарларыңызды басқарып, сақтық көшірмесін жасауға рұқсат беріңіз."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Қосымша жадты қосып, сақтық көшірме жасау"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Кіріс жәшігі толы. Орын босату үшін, қосымша жад функциясын қосып, Google-ға дауыстық хабарларыңызды басқарып, сақтық көшірмесін жасауға рұқсат беріңіз."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Дауыстық пошта PIN кодын орнатыңыз"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Дауыстық поштаны тыңдау үшін кез келген уақытта қоңырау шалғанда, дауыстық пошта PIN коды сұралады."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Белгісіз қате"</string>
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 f0ebf043d..ae75e7ae4 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"អ្នកនឹងមិនអាចទទួលសារជាសំឡេងថ្មីបានទេ បើប្រអប់សំបុត្ររបស់អ្នកពេញ។"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"មិនអាចទទួលសារជាសំឡេងថ្មីបានទេ"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"ប្រអប់សំបុត្ររបស់អ្នកពេញ។ សូមព្យាយាមលុបសារមួយចំនួនដើម្បីអាចទទួលសារជាសំឡេងថ្មីបាន។"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"បើកទំហំផ្ទុកបន្ថែម រួចបម្រុងទុក"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"ប្រអប់សាររបស់អ្នកពេញហើយ។ ដើម្បីបង្កើនទំហំផ្ទុកទំនេរ សូមបើកទំហំផ្ទុកបន្ថែម ដើម្បីឲ្យ Google អាចគ្រប់គ្រង និងបម្រុងទុកសារសារជាសំឡេងរបស់អ្នកបាន។"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"បើកទំហំផ្ទុកបន្ថែម រួចបម្រុងទុក"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"ប្រអប់សាររបស់អ្នកពេញហើយ។ ដើម្បីបង្កើនទំហំផ្ទុកទំនេរ សូមបើកទំហំផ្ទុកបន្ថែម ដើម្បីឲ្យ Google អាចគ្រប់គ្រង និងបម្រុងទុកសារសារជាសំឡេងរបស់អ្នកបាន។"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"កំណត់កូដ PIN សារជាសំឡេងរបស់អ្នក"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"អ្នកនឹងត្រូវការកូដ PIN សារជាសំឡេងមួយ គ្រប់ពេលដែលអ្នកហៅ ដើម្បីចូលដំណើរការសារជាសំឡេងរបស់អ្នក។"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"បញ្ហាមិនស្គាល់"</string>
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 7840fca9a..faa9187b1 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"ನಿಮ್ಮ ಇನ್‌ಬಾಕ್ಸ್ ಪೂರ್ಣವಾಗಿದ್ದಾಗ ಹೊಸ ಧ್ವನಿಮೇಲ್‌ ಅನ್ನು ಸ್ವೀಕರಿಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌‌ಗಳನ್ನು ಸ್ವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"ನಿಮ್ಮ ಇನ್‌ಬಾಕ್ಸ್‌ ಪೂರ್ಣವಾಗಿದೆ. ಹೊಸ ಧ್ವನಿಮೇಲ್‌ ಸ್ವೀಕರಿಸಲು ಕೆಲವು ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಲು ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹಣೆ ಮತ್ತು ಬ್ಯಾಕಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿ"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"ನಿಮ್ಮ ಮೇಲ್‌ಬಾಕ್ಸ್ ತುಂಬಿದೆ. ಸ್ಥಳಾವಕಾಶವನ್ನು ತೆರವುಗೊಳಿಸಲು, ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹವನ್ನು ಆನ್ ಮಾಡಿಕೊಳ್ಳುವ ಮೂಲಕ Google ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಬಹುದು ಮತ್ತು ಬ್ಯಾಕಪ್ ಮಾಡಬಹುದು."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹಣೆ ಮತ್ತು ಬ್ಯಾಕಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿ"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"ನಿಮ್ಮ ಮೇಲ್‌ಬಾಕ್ಸ್ ಬಹುತೇಕ ತುಂಬಿದೆ. ಸ್ಥಳಾವಕಾಶವನ್ನು ತೆರವುಗೊಳಿಸಲು, ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹವನ್ನು ಆನ್ ಮಾಡಿಕೊಳ್ಳುವ ಮೂಲಕ Google ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಬಹುದು ಮತ್ತು ಬ್ಯಾಕಪ್  ಮಾಡಬಹುದು."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಹೊಂದಿಸಿ"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ನೀವು ಕರೆ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಪ್ರವೇಶಿಸಲು ನಿಮಗೆ ಯಾವಾಗಲೂ ಧ್ವನಿಮೇಲ್‌ ಪಿನ್ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"ಅಪರಿಚಿತ ದೋಷ"</string>
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 092214db1..1492211e5 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"받은편지함이 가득 차면 새로운 음성메시지를 받을 수 없습니다."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"새로운 음성메시지를 받을 수 없음"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"받은편지함이 가득 찼습니다. 새로운 음성메시지를 받으려면 일부 메시지를 삭제해 보세요."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"추가 저장용량 및 백업 사용"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"음성사서함이 가득 찼습니다. Google에서 음성사서함 메시지를 관리하고 백업할 수 있도록 추가 저장용량을 사용 설정하여 여유 공간을 확보하세요."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"추가 저장용량 및 백업 사용"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"음성사서함이 거의 가득 찼습니다. Google에서 음성사서함 메시지를 관리하고 백업할 수 있도록 추가 저장용량을 사용 설정하여 여유 공간을 확보하세요."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"음성사서함 PIN 설정"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"음성사서함에 액세스하도록 호출할 때마다 음성사서함 PIN이 필요합니다."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"알 수 없는 오류"</string>
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 0fffb06d0..4f5d2da92 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Почтаңыз толуп калса, жаңы үн каттарын ала албай каласыз."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Жаңы үн каттары алынбай жатат"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"\"Келген каттар\" кутуңуз толуп калды. Үн каттарын алуу үчүн айрым билдирүүлөрдү өчүрүңүз."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Кошумча мейкиндик талап кылынат"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Үн почтаңызда бош орун жок. Үн каттарыңызды башкаруу жана алардын камдык көчүрмөлөрүн сактоо үчүн кошумча мейкиндикти күйгүзүп коюңуз."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Кошумча мейкиндик талап кылынат"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Үн почтаңыз толуп калды. Үн каттарыңызды башкаруу жана алардын камдык көчүрмөлөрүн сактоо үчүн кошумча мейкиндикти күйгүзүп коюңуз."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Үн почтаңыздын PIN-кодун орнотуңуз"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN-код ар чалган сайын үн почтаңызды угуу үчүн керек."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Белгисиз ката"</string>
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 d6293d2e7..df3b9db45 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"ທ່ານຈະບໍ່ສາມາດຮັບຂໍ້ຄວາມສຽງໃໝ່ໄດ້ຫາກອິນບັອກຂອງທ່ານເຕັມ."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"ບໍ່ສາມາດຮັບຂໍ້ຄວາມສຽງໃໝ່"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"ອິນບັອກຂອງທ່ານເຕັມແລ້ວ. ໃຫ້ລອງລຶບບາງຂໍ້ຄວາມອອກເພື່ອຮັບຂໍ້ຄວາມສຽງໃໝ່."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່ມເຕີມ ແລະ ການສຳຮອງຂໍ້ມູນ"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"ກ່ອງອີເມວຂອງທ່ານເຕັມແລ້ວ. ເພື່ອເພີ່ມບ່ອນຈັດເກັບຂໍ້ມູນ, ໃຫ້ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່າມເຕີມເພື່ອໃຫ້ Google ສາມາດຈັດການ ແລະ ສຳຮອງຂໍ້ມູນຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່ມເຕີມ ແລະ ການສຳຮອງຂໍ້ມູນ"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"ກ່ອງອີເມວຂອງທ່ານໃກ້ເຕັມແລ້ວ. ເພື່ອເພີ່ມບ່ອນຈັດເກັບຂໍ້ມູນ, ໃຫ້ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່າມເຕີມເພື່ອໃຫ້ Google ສາມາດຈັດການ ແລະ ສຳຮອງຂໍ້ມູນຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ຕັ້ງລະຫັດ PIN ຂໍ້ຄວາມສຽງຂອງທ່ານ"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ທ່ານຈະຕ້ອງໃຊ້ລະຫັດ PIN ໃນຕອນໃດກໍຕາມທີ່ທ່ານໂທເພື່ອເຂົ້າຟັງຂໍ້ຄວາມສຽງຂອງທ່ານ."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"ຄວາມຜິດພາດທີ່ບໍ່ຮູ້ຈັກ"</string>
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 92f3316d4..99735bb91 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Negalėsite gauti naujų balso pašto pranešimų, jei gautuosiuose nebeliks laisvos vietos."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Nepavyksta gauti naujų balso pašto pranešimų"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Gautuosiuose nebėra laisvos vietos. Kad galėtumėte gauti naujus balso pašto pranešimus, pabandykite ištrinti keletą pranešimų."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Įjunkite papildomos saugyklos vietos ir atsarginės kopijos kūrimo parinktį"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Jūsų pašto dėžutė pilna. Jei norite atlaisvinti vietos, įjunkite papildomos saugyklos vietos parinktį, kad „Google“ galėtų tvarkyti balso pašto pranešimus ir kurti atsargines jų kopijas."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Įjunkite papildomos saugyklos vietos ir atsarginės kopijos kūrimo parinktį"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Jūsų pašto dėžutė beveik pilna. Jei norite atlaisvinti vietos, įjunkite papildomos saugyklos vietos parinktį, kad „Google“ galėtų tvarkyti balso pašto pranešimus ir kurti atsargines jų kopijas."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Nustatyti balso pašto PIN kodą"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Jums reikės balso pašto PIN kodo visada, kai skambinsite norėdami pasiekti balso paštą."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nežinoma klaida"</string>
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 e27de6f21..769c3b36c 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Jūs nevarēsiet saņemt jaunus balss pasta ziņojumus, ja iesūtne ir pilna."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Nevar saņemt balss pasta ziņojumus."</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Iesūtne ir pilna. Izdzēsiet dažus ziņojumus, lai saņemtu jaunus balss pasta ziņojumus."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Papildu krātuves un dublēšanas aktivizēšana"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Jūsu pastkaste ir pilna. Lai atbrīvotu vietu un Google varētu pārvaldīt un dublēt jūsu balss pasta ziņojumus, aktivizējiet papildu krātuvi."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Papildu krātuves un dublēšanas aktivizēšana"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Jūsu pastkaste ir gandrīz pilna. Lai atbrīvotu vietu un Google varētu pārvaldīt un dublēt jūsu balss pasta ziņojumus, aktivizējiet papildu krātuvi."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Balss pasta PIN iestatīšana"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Lai piekļūtu balss pastam zvanot, būs vajadzīgs balss pasta PIN."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nezināma kļūda"</string>
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 3ff8b8739..8f3cbd09c 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Нема да може да добивате нова говорна пошта ако вашето приемно сандаче е полно."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Не може да добивате нова говорна пошта"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Вашето приемно сандаче е полно. Обидете се да избришете неколку пораки за да добиете нова говорна пошта."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Вклучете дополнителен простор и бекап"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Вашето поштенско сандаче е полно. За да ослободите простор, вклучете дополнителен простор за да може Google да управува и да прави бекап на пораките од вашата говорна пошта."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Вклучете дополнителен простор и бекап"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Вашето поштенско сандаче е речиси полно. За да ослободите простор, вклучете дополнителен простор за да може Google да управува и да прави бекап на пораките од вашата говорна пошта."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Поставете PIN за говорната пошта"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Секогаш кога ќе повикате за да пристапите до говорната пошта, ќе треба да внесете PIN за говорна пошта."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Непозната грешка"</string>
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 84d221e3d..76de01665 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"ഇൻബോക്‌സ്‌ നിറഞ്ഞിരിക്കുകയാണെങ്കിൽ നിങ്ങൾക്ക് പുതിയ വോയ്‌സ്‌മെയിൽ സ്വീകരിക്കാനാവില്ല."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"പുതിയ വോയ്‌സ്‌മെയിലുകൾ സ്വീകരിക്കാനാകുന്നില്ല"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"നിങ്ങളുടെ ഇൻബോക്‌സ്‌ നിറഞ്ഞിരിക്കുകയാണ്. പുതിയ വോയ്‌സ്‌മെയിൽ സ്വീകരിക്കാൻ ചില സന്ദേശങ്ങൾ ഇല്ലാതാക്കുന്നത് പരീക്ഷിച്ചുനോക്കൂ."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"അധിക സ്‌റ്റോറേജും ബായ്‌ക്കപ്പും ഓണാക്കുക"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"നിങ്ങളുടെ മെയിൽബോക്‌സ് നിറഞ്ഞിരിക്കുന്നു. ഇടം സൃഷ്‌ടിക്കാൻ, അധിക സ്‌റ്റോറേജ് ഓണാക്കുക, തുടർന്ന് Google-ന് നിങ്ങളുടെ വോയ്‌സ്‌മെയിൽ സന്ദേശങ്ങൾ മാനേജുചെയ്യാനും ബായ്‌ക്കപ്പെടുക്കാനുമാകും."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"അധിക സ്‌റ്റോറേജും ബായ്‌ക്കപ്പും ഓണാക്കുക"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"നിങ്ങളുടെ മെയിൽബോക്‌സ്‌ ഏകദേശം നിറഞ്ഞിരിക്കുന്നു. ഇടം സൃഷ്‌ടിക്കാൻ അധിക സ്‌റ്റോറേജ് ഓണാക്കുക, തുടർന്ന് Google-ന് നിങ്ങളുടെ വോയ്‌സ്‌മെയിൽ സന്ദേശങ്ങൾ മാനേജുചെയ്യാനും ബായ്‌ക്കപ്പെടുക്കാനുമാകും."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"നിങ്ങളുടെ വോയ്‌സ്മെയിൽ പിൻ സജ്ജമാക്കുക"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"വോയ്‌സ്മെയിൽ ആക്‌സസ് ചെയ്യാൻ ശ്രമിക്കുമ്പോഴെല്ലാം നിങ്ങൾക്കൊരു വോയ്‌സ്‌മെയിൽ പിൻ ആവശ്യമാണ്."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"തിരിച്ചറിയാനാകാത്ത പിശക്"</string>
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 99fc29dc3..8ae1fa7d2 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Ирсэн имэйл хайрцаг дүүрсэн бол та шинэ дуут шуудан хүлээж авах боломжгүй."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Шинэ дуут шуудан хүлээж авах боломжгүй"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Таны ирсэн имэйл хайрцаг дүүрэн байна. Шинэ дуут шуудан авахын тулд зарим зурвасыг устгаж үзнэ үү."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Гадаад хадгалах сан болон нөөцлөлтийг асаана уу"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Таны имэйл хайрцаг дүүрсэн байна. Сул зай гаргахын тулд гадаад хадгалах санг асааж өөрийн дуут шуудангийн зурвасуудыг удирдах, нөөцлөх боломжийг Google-д олгоно уу."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Гадаад хадгалах сан болон нөөцлөлтийг асаана уу"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Таны имэйл хайрцаг бараг дүүрсэн байна. Сул зай гаргахын тулд гадаад хадгалах санг асааж өөрийн дуут шуудангийн зурвасуудыг удирдах, нөөцлөх боломжийг Google-д олгоно уу."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Өөрийн дуут шуудангийн PIN-г тохируулна уу"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Та дуут шуудандаа хандахаар дуудлага хийх бүрт дуут шуудангийн PIN шаардлагатай болно."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Тодорхойгүй алдаа"</string>
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 43c8bddbf..ddb43a4f2 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"आपला इनबॉक्स भरलेला असल्यास आपण नवीन व्हॉइसमेल प्राप्त करण्यात सक्षम असणार नाही."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"नवीन व्हॉइसमेल प्राप्त करू शकत नाही"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"आपला इनबॉक्स भरलेला आहे. नवीन व्हॉइसमेल प्राप्त करण्यासाठी काही संदेश हटविण्याचा प्रयत्न करा."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"अतिरिक्त संचय आणि बॅक अप चालू करा"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"आपला मेलबॉक्स पूर्ण भरला आहे. स्थान मोकळे करण्यासाठी, अतिरिक्त संचय चालू करा त्यामुळे Google आपले व्हॉइसमेल संदेश व्यवस्थापित करू शकते आणि त्यांचा बॅक अप घेऊ शकते."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"अतिरिक्त संचय आणि बॅक अप चालू करा"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"आपला मेलबॉक्स जवळजवळ पूर्ण भरला आहे. स्थान मोकळे करण्यासाठी, अतिरिक्त संचय चालू करा त्यामुळे Google आपले व्हॉइसमेल संदेश व्यवस्थापित करू शकते आणि त्यांचा बॅक अप घेऊ शकते."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"आपला व्हॉइसमेल पिन सेट करा"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"आपल्या व्हॉइसमेलमध्ये प्रवेश करण्यासाठी आपण कधीही कॉल करता तेव्हा आपल्याला व्हॉइसमेल पिन आवश्यक असेल."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"अज्ञात त्रुटी"</string>
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 c8b70d55c..e104ab9bc 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Anda tidak akan dapat menerima mel suara baharu jika peti masuk anda penuh."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Tidak dapat menerima mel suara baharu"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Peti masuk anda penuh. Cuba padamkan beberapa mesej untuk menerima mel suara baharu."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Hidupkan storan tambahan dan sandaran"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Peti mel anda penuh. Untuk mengosongkan ruang, hidupkan storan tambahan supaya Google boleh mengurus dan menyandarkan mesej mel suara anda."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Hidupkan storan tambahan dan sandaran"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Peti mel anda hampir penuh. Untuk mengosongkan ruang, hidupkan storan tambahan supaya Google boleh mengurus dan menyandarkan mesej mel suara anda."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Tetapkan PIN mel suara anda"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Anda memerlukan PIN mel suara setiap kali anda memanggil untuk mengakses mel suara anda."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Ralat tidak diketahui"</string>
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 686d37d10..9c2c7ce1a 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"သင့်ဝင်စာပြည့်နေပါက အသံမေးလ်အသစ်များ လက်ခံရယူနိုင်မည်မဟုတ်ပါ။"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"အသံမေးလ်အသစ် လက်ခံ၍မရပါ"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"သင့်ဝင်စာပြည့်နေပါသည်။ အသံမေးလ်အသစ်များ လက်ခံရယူနိုင်ရန် မက်ဆေ့ဂျ်အချို့ဖျက်ကြည့်ပါ။"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"အပိုသိုလှောင်မှုနှင့် မိတ္တူ ဖွင့်ရန်"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"သင့်ဝင်စာ ပြည့်နေပါပြီ။ နေရာလွတ်ရရှိရန်အတွက် Google က သင်၏အသံမေးလ်မက်ဆေ့ဂျ်များကို စီမံခန့်ခွဲပြီး မိတ္တူကူးနိုင်ရန် အပိုသိုလှောင်မှုကို ဖွင့်ပါ။"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"အပိုသိုလှောင်မှုနှင့် မိတ္တူ ဖွင့်ရန်"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"သင့်ဝင်စာ ပြည့်လုပါပြီ။ နေရာလွတ်ရရှိရန်အတွက် Google က သင်၏အသံမေးလ်မက်ဆေ့ဂျ်များကို စီမံခန့်ခွဲပြီး မိတ္တူကူးနိုင်ရန် အပိုသိုလှောင်မှုကို ဖွင့်ပါ။"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"သင်၏အသံမေးလ်ပင်နံပါတ် သတ်မှတ်ပါ"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"သင်၏အသံမေးလ်ကို သုံးစွဲရန်အတွက် သင်ခေါ်ဆိုသည့်အခါတိုင်း အသံမေးလ်ပင်နံပါတ်တစ်ခု လိုအပ်ပါမည်။"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"အမျိုးအမည်မသိမှားယွင်းမှု"</string>
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 6fc75614a..7f620d942 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Du kan ikke motta ny talepost hvis innboksen din er full."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Kan ikke motta ny talepost"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Innboksen din er full. Prøv å slette noen meldinger for å motta ny talepost."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Slå på ekstra lagringsplass og sikkerhetskopiering"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Talepostkassen din er full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Slå på ekstra lagringsplass og sikkerhetskopiering"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Talepostkassen din er nesten full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Angi PIN-koden din for talepost"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Du trenger PIN-koden hver gang du ringer for å sjekke taleposten din."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Ukjent feil"</string>
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 ff06fa06c..b84b5473e 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"तपाईंको इनबक्स भरिएको छ भने तपाईंले नयाँ भ्वाइस मेल प्राप्त गर्न सक्नुहुने छैन।"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"नयाँ भ्वाइस मेलहरू प्राप्त गर्न सकिँदैन"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"तपाईँको इनबक्स भरिएको छ। नयाँ भ्वाइस मेलहरू प्राप्त गर्न कृपया केही सन्देशहरू मेटी हेर्नुहोस्।"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"अतिरिक्त भण्डारण र ब्याकअप सेवा सक्रिय पार्नुहोस्"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"तपाईंको मेल बक्स भरिएको छ। ठाउँ खाली गर्न, Google ले तपाईंका भ्वाइस मेल सन्देशहरूको व्यवस्थापन र ब्याकअप गर्न सकोस् भन्नाका खातिर अतिरिक्त भण्डारणलाई सक्रिय पार्नुहोस्।"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"अतिरिक्त भण्डारण र ब्याकअप सेवा सक्रिय पार्नुहोस्"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"तपाईंको मेल बक्स लगभग भरिएको छ। ठाउँ खाली गर्न Google ले तपाईंका भ्वाइस मेल सन्देशहरूको व्यवस्थापन र ब्याकअप गर्न सकोस् भन्नाका खातिर अतिरिक्त भण्डारणलाई सक्रिय पार्नुहोस्।"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"आफ्नो भ्वाइस मेलको PIN सेट गर्नुहोस्"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"तपाईँलाई जुनसुकै समयमा आफ्नो भ्वाइस मेलमा पहुँच गर्न कल गर्दा भ्वाइस मेल PIN को आवश्यकता पर्दछ।"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"अज्ञात त्रुटि"</string>
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 f74a37d8d..479ea1866 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Je kunt geen nieuwe voicemails ontvangen als je inbox vol is."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Kan geen nieuwe voicemails ontvangen"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Je inbox is vol. Verwijder enkele berichten om nieuwe voicemails te ontvangen."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Extra opslag en back-up inschakelen"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Je mailbox is vol. Als je ruimte wilt vrijmaken, schakel je extra opslagruimte in zodat Google je voicemailberichten kan beheren en er back-ups van kan maken."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Extra opslag en back-up inschakelen"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Je mailbox is bijna vol. Als je ruimte wilt vrijmaken, schakel je extra opslagruimte in zodat Google je voicemailberichten kan beheren en er back-ups van kan maken."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Een pincode voor je voicemail instellen"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Je hebt een pincode voor de voicemail nodig wanneer je belt om toegang tot je voicemail te krijgen."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Onbekende fout"</string>
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 6fc75614a..7f620d942 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Du kan ikke motta ny talepost hvis innboksen din er full."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Kan ikke motta ny talepost"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Innboksen din er full. Prøv å slette noen meldinger for å motta ny talepost."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Slå på ekstra lagringsplass og sikkerhetskopiering"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Talepostkassen din er full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Slå på ekstra lagringsplass og sikkerhetskopiering"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Talepostkassen din er nesten full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Angi PIN-koden din for talepost"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Du trenger PIN-koden hver gang du ringer for å sjekke taleposten din."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Ukjent feil"</string>
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 2a07b459d..f59063117 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"ਜੇਕਰ ਤੁਹਾਡਾ ਇਨਬਾਕਸ ਭਰਿਆ ਹੋਇਆ ਹੈ ਤਾਂ ਤੁਸੀਂ ਨਵੀਂ ਵੌਇਸਮੇਲ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ।"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"ਤੁਹਾਡਾ ਇਨਬਾਕਸ ਭਰਿਆ ਹੋਇਆ ਹੈ। ਨਵੀਂ ਵੌਇਸਮੇਲ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਕੁਝ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਅਤੇ ਬੈਕਅੱਪ ਲਓ"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"ਤੁਹਾਡਾ ਮੇਲਬਾਕਸ ਭਰਿਆ ਹੋਇਆ ਹੈ। ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਲਈ, ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ Google ਤੁਹਾਡੇ ਵੌਇਸਮੇਲ ਸੁਨੇਹਿਆਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕੇ ਅਤੇ ਬੈਕਅੱਪ ਲੈ ਸਕੇ।"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਅਤੇ ਬੈਕਅੱਪ ਲਓ"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"ਤੁਹਾਡਾ ਮੇਲਬਾਕਸ ਲਗਭਗ ਭਰਿਆ ਹੋਇਆ ਹੈ। ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਲਈ, ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ Google ਤੁਹਾਡੇ ਵੌਇਸਮੇਲ ਸੁਨੇਹਿਆਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕੇ ਅਤੇ ਬੈਕਅੱਪ ਲੈ ਸਕੇ।"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ਆਪਣਾ ਵੌਇਸਮੇਲ PIN ਸੈੱਟ ਕਰੋ"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਆਪਣੀ ਵੌਇਸਮੇਲ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰੋਂਗੇ ਤਾਂ ਤੁਹਾਨੂੰ ਇੱਕ ਵੌਇਸਮੇਲ PIN ਦੀ ਲੋੜ ਪਵੇਗੀ।"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"ਅਗਿਆਤ ਗੜਬੜ"</string>
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 b12290821..0b3f1c2c3 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Nie otrzymasz nowych wiadomości głosowych, gdy Twoja skrzynka odbiorcza jest pełna."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Nie udało się odebrać nowych wiadomości głosowych"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Twoja skrzynka odbiorcza jest pełna. Spróbuj usunąć kilka wiadomości głosowych, aby odebrać nowe."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Włącz dodatkowe miejsce i kopię zapasową"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Twoja skrzynka pocztowa jest pełna. Jeśli chcesz zwolnić miejsce, włącz dodatkowe miejsce, aby umożliwić Google zarządzanie Twoimi wiadomościami głosowymi i tworzenie ich kopii zapasowej."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Włącz dodatkowe miejsce i kopię zapasową"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Twoja skrzynka pocztowa jest prawie pełna. Jeśli chcesz zwolnić miejsce, włącz dodatkowe miejsce, aby umożliwić Google zarządzanie Twoimi wiadomościami głosowymi i tworzenie ich kopii zapasowej."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ustaw kod PIN do poczty głosowej"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Za każdym razem, gdy zadzwonisz pod numer poczty głosowej, będzie konieczne wpisanie kodu PIN."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nieznany błąd"</string>
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 bbe9340a6..424d52a44 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Não será possível receber novos correios de voz se sua Caixa de entrada estiver cheia."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Não é possível receber novos correios de voz"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Sua Caixa de entrada está cheia. Exclua algumas mensagens para receber novos correios de voz."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Ativar armazenamento extra e fazer backup"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Sua caixa de correio está cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das suas mensagens do correio de voz."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Ativar armazenamento extra e fazer backup"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Sua caixa de correio está quase cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das suas mensagens do correio de voz."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Definir seu PIN do correio de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Você precisará de um PIN do correio de voz sempre que ligar para acessar seu correio de voz."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Erro desconhecido"</string>
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 364b2783d..a48929605 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Se a sua caixa de entrada estiver cheia, não irá receber novas mensagens de correio de voz."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Não é possível receber novas mensagens de correio de voz"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"A sua caixa de entrada está cheia. Tente eliminar algumas mensagens para receber novas mensagens de correio de voz."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Ativar o armazenamento adicional e a cópia de segurança"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"A sua caixa de correio está cheia. Para libertar espaço, ative o armazenamento adicional para que a Google possa gerir e criar uma cópia de segurança das suas mensagens de correio de voz."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Ativar o armazenamento adicional e a cópia de segurança"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"A sua caixa de correio está quase cheia. Para libertar espaço, ative o armazenamento adicional para que a Google possa gerir e criar uma cópia de segurança das suas mensagens de correio de voz."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Definir o seu PIN do correio de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Irá precisar de um PIN do correio de voz sempre que efetuar uma chamada para aceder ao seu correio de voz."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Erro desconhecido"</string>
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 bbe9340a6..424d52a44 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Não será possível receber novos correios de voz se sua Caixa de entrada estiver cheia."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Não é possível receber novos correios de voz"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Sua Caixa de entrada está cheia. Exclua algumas mensagens para receber novos correios de voz."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Ativar armazenamento extra e fazer backup"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Sua caixa de correio está cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das suas mensagens do correio de voz."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Ativar armazenamento extra e fazer backup"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Sua caixa de correio está quase cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das suas mensagens do correio de voz."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Definir seu PIN do correio de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Você precisará de um PIN do correio de voz sempre que ligar para acessar seu correio de voz."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Erro desconhecido"</string>
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 263ab003d..1c16e7041 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Nu veți putea primi mesaje vocale noi dacă aveți căsuța de mesaje plină."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Nu puteți primi mesaje vocale noi"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Căsuța de mesaje este plină. Încercați să ștergeți câteva mesaje pentru a putea primi unele noi."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Activați spațiul de stocare suplimentar și backupul"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Căsuța dvs. de e-mail este plină. Pentru a elibera spațiu, activați spațiul de stocare suplimentar și astfel Google poate să vă gestioneze mesajele vocale și să facă backup pentru acestea."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Activați spațiul de stocare suplimentar și backupul"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Căsuța dvs. de e-mail este aproape plină. Pentru a elibera spațiu, activați spațiul de stocare suplimentar și astfel Google poate să vă gestioneze mesajele vocale și să facă backup pentru acestea."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Setați un cod PIN pentru mesageria vocală"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Aveți nevoie de un cod PIN pentru mesageria vocală când sunați pentru a o accesa."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Eroare necunoscută"</string>
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 1989f269c..6e404b03e 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Когда почтовый ящик будет заполнен, вы не сможете получать новые голосовые сообщения."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Нет свободного места"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Почтовый ящик заполнен. Чтобы получать новые голосовые сообщения, удалите старые."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Требуется дополнительное пространство"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Почтовый ящик заполнен. Чтобы освободить место, активируйте дополнительное пространство. После этого Google сможет управлять вашими голосовыми сообщениями и сохранять их резервные копии."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Требуется дополнительное пространство"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Почтовый ящик почти заполнен. Чтобы освободить место, активируйте дополнительное пространство. После этого Google сможет управлять вашими голосовыми сообщениями и сохранять их резервные копии."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Установите PIN-код голосовой почты"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Он будет нужен вам каждый раз, когда вы звоните, чтобы прослушать голосовую почту."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Неизвестная ошибка"</string>
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 2a057facd..848b2b85f 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"ඔබේ එන ලිපි පිරී ඇති නම් ඔබට නව හඩ තැපැල් ලැබීමට නොහැකි වනු ඇත."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"නව හඬ තැපැල් ලැබීමට නොහැකිය"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"ඔබේ එන ලිපි පිරී ඇත. නව හඬ තැපැල් ලබා ගැනීමට පණිවිඩ සමහරක් මැකීම උත්සාහ කරන්න."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"අතිරේක ගබඩාව සහ උපස්ථය ක්‍රියාත්මක කරන්න"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"ඔබේ තැපැල් පෙට්ටිය පිරී ඇත. ඉඩ නිදහස් කර ගැනීමට, අතිරේක ගබඩාව ක්‍රියාත්මක කරන්න. එවිට Google හට ඔබේ හඬ තැපැල් පණිවිඩ කළමනාකරණය කිරීමට සහ උපස්ථ කිරීමට හැකිය."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"අතිරේක ගබඩාව සහ උපස්ථය ක්‍රියාත්මක කරන්න"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"ඔබේ තැපැල් පෙට්ටිය මුළුමනින්ම පාහේ පිරී ඇත. ඉඩ නිදහස් කර ගැනීමට, අතිරේක ගබඩාව ක්‍රියාත්මක කරන්න. එවිට Google හට ඔබේ හඬ තැපැල් පණිවිඩ කළමනාකරණය කිරීමට සහ උපස්ථ කිරීමට හැකිය."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ඔබේ හඬ තැපැල් PIN අංකය සකසන්න"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ඔබ ඔබේ හඬ තැපෑලට ප්‍රවේශ වීමට අමතන ඕනෑම අවස්ථාවක ඔබට හඬ තැපැල් PIN අංකයක් අවශ්‍ය වනු ඇත."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"නොදන්නා දෝෂයකි"</string>
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 165a9f58c..ed213a020 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"S plnou doručenou poštou nebudete môcť prijímať nové hlasové správy."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Nemôžete prijímať nové hlasové správy"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Máte plnú doručenú poštu. Skúste odstrániť niekoľko správ, aby ste mohli prijať novú hlasovú správu."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Zapnite si ďalšie úložisko a zálohovanie"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Poštovú schránku máte plnú. Ak chcete uvoľniť miesto, zapnite si ďalšie úložisko, aby mohol Google spravovať a zálohovať vaše hlasové správy."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Zapnite si ďalšie úložisko a zálohovanie"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Poštovú schránku máte takmer plnú. Ak chcete uvoľniť miesto, zapnite si ďalšie úložisko, aby mohol Google spravovať a zálohovať vaše hlasové správy."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Nastaviť kód PIN hlasovej schránky"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Kód PIN hlasovej schránky budete potrebovať vždy, keď zavoláte do svojej hlasovej schránky."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Neznáma chyba"</string>
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 d4f63c1e4..7a186508a 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Če je nabiralnik poln, ne boste mogli prejemati novih sporočil v odzivniku."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Vizualnih sporočil v odzivniku ni mogoče prejemati"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Nabiralnik je poln. Poskusite izbrisati nekaj sporočil, da bo mogoče prejeti nova sporočila v odzivniku."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Vklop dodatnega prostora za shranjevanje in varnostno kopiranje"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Odzivnik je poln. Če želite sprostiti prostor, vklopite dodaten prostor za shranjevanje, da bo Google lahko upravljal vaša sporočila v odzivniku in jih varnostno kopiral."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Vklop dodatnega prostora za shranjevanje in varnostno kopiranje"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Odzivnik je skoraj poln. Če želite sprostiti prostor, vklopite dodaten prostor za shranjevanje, da bo Google lahko upravljal vaša sporočila v odzivniku in jih varnostno kopiral."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Nastavite kodo PIN za glasovno pošto"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Kodo PIN za glasovno pošto boste potrebovali ob vsakem klicu za dostop do glasovne pošte."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Neznana napaka"</string>
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 d400cd8ef..0b33e19c9 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Nuk mund të marrësh postë zanore të re nëse kutia hyrëse është plot."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Posta zanore nuk mund të merret"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Kutia hyrëse është plot. Provo të fshish disa mesazhe për të marrë postë zanore të re."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Aktivizo hapësirën ruajtëse shtesë dhe rezervimin"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Kutia jote postare është plot. Për të liruar hapësirën, aktivizo hapësirën ruajtëse shtesë që Google të mund të menaxhojë dhe të rezervojë mesazhet e tua të postës zanore."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Aktivizo hapësirën ruajtëse shtesë dhe rezervimin"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Kutia jote postare është thuajse plot. Për të liruar hapësirën, aktivizo hapësirën ruajtëse shtesë që Google të mund të menaxhojë dhe të rezervojë mesazhet e tua të postës zanore."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Vendos kodin PIN të postës zanore"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Të duhet një kod PIN për postën zanore në çdo kohë që telefonon për të hyrë te posta zanore."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Gabim i panjohur"</string>
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 da1853a14..9ed087a78 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Нећете моћи да примате нову говорну пошту ако је пријемно сандуче пуно."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Не можете да примате нове говорне поруке"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Пријемно сандуче је пуно. Избришите неке поруке да бисте примили нову говорну пошту."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Укључите додатни меморијски простор и резервне копије"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Поштанско сандуче је пуно. Да бисте ослободили простор, укључите додатни меморијски простор, па ће Google моћи да управља вашим говорним порукама и прави њихове резервне копије."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Укључите додатни меморијски простор и резервне копије"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Поштанско сандуче је скоро пуно. Да бисте ослободили простор, укључите додатни меморијски простор, па ће Google моћи да управља вашим говорним порукама и прави њихове резервне копије."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Подесите PIN говорне поште"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN говорне поште вам треба сваки пут кад упућујете позив да бисте приступили говорној пошти."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Непозната грешка"</string>
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 cfab8305a..0ea6dbe5b 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Du kan inte ta emot nya röstmeddelanden om inkorgen är full."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Du kan inte ta emot nya röstmeddelanden."</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Inkorgen är full. Testa att radera några meddelanden om du vill kunna ta emot nya röstmeddelanden."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Aktivera extra lagring och säkerhetskopiering"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Din postlåda är full. Frigör utrymme genom att aktivera extra lagringsutrymme så att Google kan hantera och säkerhetskopiera dina röstmeddelanden."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Aktivera extra lagring och säkerhetskopiering"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Din postlåda är nästan full. Frigör utrymme genom att aktivera extra lagringsutrymme så att Google kan hantera och säkerhetskopiera dina röstmeddelanden."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ange PIN-kod till röstbrevlåda"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Du måste ha en PIN-kod till röstbrevlådan varje gång du ringer till den."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Okänt fel"</string>
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 56aad211c..85a7165cc 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Hutaweza kupokea ujumbe mpya wa sauti kama kikasha chako kimejaa."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Huwezi kupokea ujumbe mpya wa sauti"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Kikasha chako kimejaa. Jaribu kufuta baadhi ili uweze kupokea ujumbe mpya wa sauti."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Washa nafasi ya ziada halafu uhifadhi nakala rudufu"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Sanduku lako la ujumbe wa sauti limejaa. Ili upate nafasi, washa hifadhi ya ziada ili Google idhibiti na kuweka nakala rudufu ya ujumbe wako wa sauti."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Washa nafasi ya ziada halafu uhifadhi nakala rudufu"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Sanduku lako la ujumbe wa sauti linakaribia kujaa. Ili upate nafasi, washa hifadhi ya ziada ili Google idhibiti na kuweka nakala rudufu ya ujumbe wako wa sauti."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Weka PIN yako ya ujumbe wa sauti"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Utahitaji PIN ya ujumbe wa sauti wakati wowote unapopiga simu ili ufikie ujumbe wako wa sauti."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Hitilafu isiyojulikana"</string>
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 f2613f082..8cbaa8f69 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"இன்பாக்ஸ் நிரம்பியிருந்தால், புதிய குரலஞ்சலைப் பெற முடியாது."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"புதிய குரலஞ்சல்களைப் பெற முடியவில்லை"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"இன்பாக்ஸ் நிரம்பிவிட்டது. புதிய குரலஞ்சல்களைப் பெற, சில செய்திகளை நீக்கவும்."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"கூடுதல் சேமிப்பகத்தையும் காப்புப் பிரதியையும் இயக்கு"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"உங்கள் அஞ்சல்பெட்டி நிரம்பிவிட்டது. இடத்தைக் காலியாக்க, கூடுதல் சேமிப்பகத்தை இயக்கவும். இதன் மூலம் Google உங்கள் குரலஞ்சல் செய்திகளை நிர்வகித்து, காப்புப் பிரதி எடுக்கலாம்."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"கூடுதல் சேமிப்பகத்தையும் காப்புப் பிரதியையும் இயக்கு"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"உங்கள் அஞ்சல்பெட்டி கிட்டத்தட்ட நிரம்பிவிட்டது. இடத்தைக் காலியாக்க, கூடுதல் சேமிப்பகத்தை இயக்கவும். இதன் மூலம் Google உங்கள் குரலஞ்சல் செய்திகளை நிர்வகித்து, காப்புப் பிரதி எடுக்கலாம்."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"உங்கள் குரலஞ்சல் பின்னை அமைக்கவும்"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"உங்கள் குரலஞ்சலை அணுகுவதற்கு நீங்கள் எப்போது அழைத்தாலும் குரலஞ்சல் பின் அவசியம்."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"அறியப்படாத பிழை"</string>
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 a881550e8..6608a0d35 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"మీ ఇన్‌బాక్స్ నిండిపోయి ఉంటే, కొత్త వాయిస్ మెయిల్‌ను స్వీకరించలేరు."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"కొత్త వాయిస్ మెయిల్‌లను స్వీకరించలేరు"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"మీ ఇన్‌బాక్స్ నిండింది. కొత్త వాయిస్ మెయిల్‌ను స్వీకరించడానికి కొన్ని సందేశాలను తొలగించడానికి ప్రయత్నించండి."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"అదనపు నిల్వ మరియు బ్యాకప్‌ను ఆన్ చేయండి"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"మీ మెయిల్‌బాక్స్ నిండింది. స్థలాన్ని ఖాళీ చేసేందుకు అదనపు నిల్వను ఆన్ చేయండి, దీని వలన Google మీ వాయిస్ మెయిల్ సందేశాలను నిర్వహించగలదు మరియు బ్యాకప్ చేయగలదు."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"అదనపు నిల్వ మరియు బ్యాకప్‌ను ఆన్ చేయండి"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"మీ మెయిల్‌బాక్స్ దాదాపు నిండిపోయింది. స్థలాన్ని ఖాళీ చేసేందుకు అదనపు నిల్వను ఆన్ చేయండి, దీని వలన Google మీ వాయిస్ మెయిల్ సందేశాలను నిర్వహించగలదు మరియు బ్యాకప్ చేయగలదు."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"మీ వాయిస్ మెయిల్ PIN సెట్ చేయండి"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"మీరు మీ వాయిస్ మెయిల్‌ను ప్రాప్యత చేయడానికి కాల్ చేసే ప్రతిసారి మీకు వాయిస్ మెయిల్ PIN అవసరమవుతుంది."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"తెలియని లోపం"</string>
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 31302cc65..317a11e80 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"คุณจะไม่สามารถรับข้อความเสียงใหม่ได้ ถ้ากล่องจดหมายเต็ม"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"ไม่สามารถรับข้อความเสียงใหม่ได้"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"กล่องจดหมายเต็ม ลองลบข้อความบางส่วนออกเพื่อรับข้อความเสียงใหม่"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"เปิดพื้นที่เก็บข้อมูลเพิ่มเติมและการสำรองข้อมูล"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"กล่องจดหมายของคุณเต็มแล้ว หากต้องการเพิ่มพื้นที่ว่าง โปรดเปิดพื้นที่เก็บข้อมูลเพิ่มเติมเพื่อให้ Google สามารถจัดการและเก็บสำรองข้อความเสียงได้"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"เปิดพื้นที่เก็บข้อมูลเพิ่มเติมและการสำรองข้อมูล"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"กล่องจดหมายของคุณใกล้เต็มแล้ว หากต้องการเพิ่มพื้นที่ว่าง โปรดเปิดพื้นที่เก็บข้อมูลเพิ่มเติมเพื่อให้ Google สามารถจัดการและเก็บสำรองข้อความเสียงได้"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ตั้งค่า PIN ข้อความเสียง"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"คุณต้องใช้ PIN ข้อความเสียงทุกครั้งที่โทรหาบริการข้อความเสียง"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"ข้อผิดพลาดที่ไม่ทราบสาเหตุ"</string>
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 b99d0c377..7da4bb956 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Hindi ka makakatanggap ng bagong voicemail kung puno na ang inbox mo."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Hindi makatanggap ng mga bagong voicemail"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Puno na ang inbox mo. Subukang i-delete ang ilang mensahe upang makatanggap ng bagong voicemail."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"I-on ang karagdagang storage at backup"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Puno na ang iyong mailbox. Upang magbakante ng space, i-on ang karagdagang storage para pamahalaan at i-back up ng Google ang iyong mga mensahe sa voicemail."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"I-on ang karagdagang storage at backup"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Malapit nang mapuno ang iyong mailbox. Upang magbakante ng space, i-on ang karagdagang storage para pamahalaan at i-back up ng Google ang iyong mga mensahe sa voicemail."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Itakda ang iyong PIN sa voicemail"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Kakailanganin mo ng isang PIN sa voicemail sa tuwing tatawag ka upang ma-access ang iyong voicemail."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Hindi alam na error"</string>
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 be5cbb027..cbf863442 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Gelen kutunuz dolarsa yeni sesli mesajları alamayacaksınız."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Yeni sesli mesajlar alınamıyor"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Gelen kutunuz doldu. Yeni sesli mesajları almak için bazı mesajları silmeyi deneyin."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Ekstra depolama alanını ve yedeklemeyi etkinleştirin"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Posta kutunuz dolu. Google\'ın sesli mesajlarınızı yönetebileceği ve yedekleyebileceği şekilde yer açmak için ekstra depolama alanını etkinleştirin."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Ekstra depolama alanını ve yedeklemeyi etkinleştirin"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Posta kutunuz dolmak üzere. Google\'ın sesli mesajlarınızı yönetebileceği ve yedekleyebileceği şekilde yer açmak için ekstra depolama alanını etkinleştirin."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Sesli mesaj PIN\'inizi ayarlayın"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Sesli mesajlarınıza erişmek için her aradığınızda bir sesli mesaj PIN\'i girmeniz gerekecek."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Bilinmeyen hata"</string>
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 6adf49ab9..58ff67b07 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Якщо папка вхідної голосової пошти заповнена, ви не зможете отримувати нові повідомлення."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Неможливо отримати нові голосові повідомлення"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Папка вхідної голосової пошти заповнена. Видаліть деякі повідомлення, щоб отримати нові."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Увімкніть додаткову пам’ять і резервне копіювання"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"У поштовій скриньці не залишилося місця. Щоб звільнити його, увімкніть додаткову пам’ять, і тоді Google почне робити резервні копії вашої голосової пошти й керувати нею."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Увімкніть додаткову пам’ять і резервне копіювання"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"У поштовій скриньці майже не залишилося місця. Щоб звільнити його, увімкніть додаткову пам’ять, і тоді Google почне робити резервні копії вашої голосової пошти й керувати нею."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Установіть PIN-код голосової пошти"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN-код буде потрібен під час кожного дзвінка на голосову пошту."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Невідома помилка"</string>
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 e6fd9f7a0..3b83e892d 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"اگر آپ کا ان باکس بھرا ہوا ہوگا تو آپ نئی صوتی میل موصول نہیں کر پائیں گے۔"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"نئی صوتی میلز موصول نہیں ہو سکتی"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"آپ کا ان باکس بھرا ہوا ہے۔ نئی صوتی میل موصول کرنے کیلئے کچھ پیغامات حذف کرنے کی کوشش کریں۔"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"اضافی اسٹوریج اور بیک اپ آن کریں"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"‏آپ کا میل باکس بھر گیا ہے۔ جگہ خالی کرنے کیلئے، اضافی اسٹوریج کو آن کریں تا کہ Google آپ کے صوتی میل پیغامات کا بیک اپ اور ان کا نظم کر سکے۔"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"اضافی اسٹوریج اور بیک اپ آن کریں"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"‏آپ کا میل باکس تقریباً بھر گیا ہے۔ جگہ خالی کرنے کیلئے، اضافی اسٹوریج کو آن کریں تا کہ Google آپ کے صوتی میل پیغامات کا بیک اپ اور ان کا نظم کر سکے۔"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"‏اپنی صوتی میل PIN سیٹ کریں"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"‏آپ جب بھی صوتی میل تک رسائی کیلئے کال کریں گے تو آپ کو صوتی میل PIN چاہئیے ہوگی۔"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"نامعلوم خرابی"</string>
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 5583e2778..d1fad1e51 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Agar ovozli pochta qutisi to‘lib qolsa, yangi xabarlar qabul qilishning imkoni bo‘lmay qoladi."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Yangi ovozli pochta xabarlarini qabul qilib bo‘lmadi"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Ovozli pochta qutisi to‘lgan. Yangi xabarlar qabul qilish uchun eskilaridan bir nechtasini o‘chirib tashlang."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Qo‘shimcha xotira va zaxiralash xususiyatini yoqish"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Pochtangiz qutisi deyarli to‘lgan. Unda joy bo‘shatish uchun qo‘shimcha xotirani yoqing. Google esa, ovozli xabarlaringiz nusxasini zaxiralashni hamda ularni boshqarishni boshlaydi."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Qo‘shimcha xotira va zaxiralash xususiyatini yoqish"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Pochtangiz qutisi deyarli to‘lgan. Unda joy bo‘shatish uchun qo‘shimcha xotirani yoqing. Google esa, ovozli xabarlaringiz nusxasini zaxiralashni hamda ularni boshqarishni boshlaydi."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ovozli pochta uchun PIN kod o‘rnatish"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Ovozli pochtaga har safar qo‘ng‘iroq qilinganda PIN kod so‘raladi."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Noma’lum xatolik"</string>
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 029396e31..356d5f4b4 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Bạn sẽ không thể nhận được thư thoại mới nếu hộp thư đến của bạn đã đầy."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Không nhận được thư thoại mới"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Hộp thư đến của bạn đã đầy. Hãy thử xóa một vài thư để nhận thư thoại mới."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Bật sao lưu và bộ nhớ bổ sung"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Hộp thư của bạn đã đầy. Để giải phóng dung lượng, hãy bật bộ nhớ bổ sung để Google có thể quản lý và sao lưu thư thoại của bạn."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Bật sao lưu và bộ nhớ bổ sung"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Hộp thư của bạn đã gần đầy. Để giải phóng dung lượng, hãy bật bộ nhớ bổ sung để Google có thể quản lý và sao lưu thư thoại của bạn."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Đặt mã PIN thư thoại của bạn"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Bạn cần có mã PIN thư thoại mỗi khi gọi để truy cập thư thoại của mình."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Lỗi không xác định"</string>
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 faa36dead..7826676f5 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"如果收件箱已满，您将无法接收新的语音邮件。"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"无法接收新的语音邮件"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"您的收件箱已满。请尝试删除部分邮件，以便接收新的语音邮件。"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"启用额外存储空间和备份功能"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"您的邮箱已满。要释放空间，请启用额外存储空间，以便 Google 管理和备份您的语音邮件。"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"启用额外存储空间和备份功能"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"您的邮箱快满了。要释放空间，请启用额外存储空间，以便 Google 管理和备份您的语音邮件。"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"设置语音信箱 PIN 码"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"您必须使用语音信箱 PIN 码，才能访问您的语音信箱。"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"未知错误"</string>
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 e51a0a902..e3c31eb19 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"如果您的收件箱已滿，就無法接收新留言。"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"無法接收新留言"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"您的收件箱已滿。建議您刪除部分訊息以接收新留言。"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"啟用額外儲存裝置和備份功能"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"您的信箱已滿。若要騰出空間，請啟用額外儲存裝置，以便 Google 管理並備份您的留言訊息。"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"啟用額外儲存裝置和備份功能"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"您的信箱快要滿了。若要騰出空間，請啟用額外儲存裝置，以便 Google 管理並備份您的留言訊息。"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"設定留言信箱 PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"您必須輸入留言信箱 PIN 才可收聽留言。"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"不明錯誤"</string>
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 7f2e1d61c..96d5f9543 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"收件匣已滿時無法接收新的語音留言。"</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"無法接收新的語音留言"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"您的收件匣已滿。請刪除部分訊息，以便接收新的語音留言。"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"啟用額外的儲存空間和備份功能"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"你的信箱容量已滿。如要釋出空間，請啟用額外的儲存空間，方便 Google 管理及備份你的語音留言。"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"啟用額外的儲存空間和備份功能"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"你的信箱容量幾乎已滿。如要釋出空間，請啟用額外的儲存空間，方便 Google 管理及備份你的語音留言。"</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"設定您的語音信箱 PIN 碼"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"您必須輸入語音信箱 PIN 碼才能存取您的語音信箱。"</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"不明錯誤"</string>
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 8d3cd79ea..20f7f1659 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
@@ -44,10 +44,14 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"Ngeke uze ukwazi ukuthola ivoyisimeyili entsha uma ibhokisi lakho lokungenayo ligcwele."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Ayikwazi ukwamukela amavoyisimeyili amasha"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Ibhokisi lakho lokungenayo ligcwele. Zama ukususa eminye imilayezo ukuze uthole ivoyisimeyili entsha."</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="6209039728273651055">"Vula isitoreji esingeziwe nesipele"</string>
-    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="5203159732288749722">"Ibhokisi lakho lemeyili ligcwele. Ukuze ukhulule isikhala, vula isitoreji esingeziwe ukuze i-Google ikwazi ukuphatha futhi yenze isipele imilTo free up space, turn on extra storage so Google can manage and backup your voicemail messages."</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="20352920357816927">"Vula isitoreji esingeziwe nesipele"</string>
-    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Ibhokisi lakho lemeyili cishe ligcwele. Ukuze ukhulule isikhala, vula isitoreji esingeziwe ukuze i-Google ikwazi ukuphatha nokwenza isipele imilayezo yakho yevoyisimeyili."</string>
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
+    <skip />
+    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
+    <skip />
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Setha iphini yakho yevoyisimeyili"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Udinga iphini yevoyisimeyili noma kunini uma wenza ikholi ukufinyelela ivoyisimeyili yakho."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Iphutha elingaziwa"</string>
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 94d3dba11..d14652553 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
@@ -54,11 +54,11 @@
   <string name="voicemail_error_inbox_full_title">Can\'t receive new voicemails</string>
   <string name="voicemail_error_inbox_full_message">Your inbox is full. Try deleting some messages to receive new voicemail.</string>
 
-  <string name="voicemail_error_inbox_full_turn_archive_on_title">Turn on extra storage and backup</string>
-  <string name="voicemail_error_inbox_full_turn_archive_on_message">Your mailbox is full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">[Experimental] Turn on extra storage and backup</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Your mailbox is full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages. <b><i>This feature is currently being tested </i></b>and will potentially delete voicemails from your voicemail server, and we do not promise to support this feature in the future. We would love your feedback though.</string>
 
-  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Turn on extra storage and backup</string>
-  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Your mailbox is almost full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">[Experimental] Turn on extra storage and backup</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Your mailbox is almost full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages. <b><i>This feature is currently being tested </i></b>and will potentially delete voicemails from your voicemail server, and we do not promise to support this feature in the future. We would love your feedback though.</string>
 
   <string name="voicemail_error_pin_not_set_title">Set your voicemail PIN</string>
   <string name="voicemail_error_pin_not_set_message">You\'ll need a voicemail PIN anytime you call to access your voicemail.</string>
diff --git a/java/com/android/dialer/binary/aosp/AospDialerApplication.java b/java/com/android/dialer/binary/aosp/AospDialerApplication.java
index f657a3987..4ca94e277 100644
--- a/java/com/android/dialer/binary/aosp/AospDialerApplication.java
+++ b/java/com/android/dialer/binary/aosp/AospDialerApplication.java
@@ -26,5 +26,10 @@ import com.android.dialer.inject.ContextModule;
  */
 public class AospDialerApplication extends DialerApplication {
 
-
+  /** Returns a new instance of the root component for the AOSP Dialer. */
+  @Override
+  @NonNull
+  protected Object buildRootComponent() {
+    return DaggerAospDialerRootComponent.builder().contextModule(new ContextModule(this)).build();
+  }
 }
diff --git a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
index 8628e90c2..54fedc2be 100644
--- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
+++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
@@ -27,4 +27,15 @@ import dagger.Component;
 import javax.inject.Singleton;
 
 /** Root component for the AOSP Dialer application. */
+@Singleton
+@Component(
+  modules = {
+    ContextModule.class,
+    SimulatorModule.class,
+    StubCallLocationModule.class,
+    StubEnrichedCallModule.class,
+    StubMapsModule.class,
+    VoicemailModule.class
+  }
+)
 public interface AospDialerRootComponent extends BaseDialerRootComponent {}
diff --git a/java/com/android/dialer/binary/common/DialerApplication.java b/java/com/android/dialer/binary/common/DialerApplication.java
index c0be4328c..cc7befc90 100644
--- a/java/com/android/dialer/binary/common/DialerApplication.java
+++ b/java/com/android/dialer/binary/common/DialerApplication.java
@@ -22,9 +22,10 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import com.android.dialer.blocking.BlockedNumbersAutoMigrator;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
+import com.android.dialer.inject.HasRootComponent;
 
 /** A common application subclass for all Dialer build variants. */
-public abstract class DialerApplication extends Application {
+public abstract class DialerApplication extends Application implements HasRootComponent {
 
   private volatile Object rootComponent;
 
@@ -40,4 +41,27 @@ public abstract class DialerApplication extends Application {
     Trace.endSection();
   }
 
+  /**
+   * Returns a new instance of the root component for the application. Sub classes should define a
+   * root component that extends all the sub components "HasComponent" intefaces. The component
+   * should specify all modules that the application supports and provide stubs for the remainder.
+   */
+  @NonNull
+  protected abstract Object buildRootComponent();
+
+  /** Returns a cached instance of application's root component. */
+  @Override
+  @NonNull
+  public final Object component() {
+    Object result = rootComponent;
+    if (result == null) {
+      synchronized (this) {
+        result = rootComponent;
+        if (result == null) {
+          rootComponent = result = buildRootComponent();
+        }
+      }
+    }
+    return result;
+  }
 }
diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java
index f73563ff8..9fb6c38f4 100644
--- a/java/com/android/dialer/callcomposer/CallComposerActivity.java
+++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java
@@ -49,7 +49,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toolbar;
 import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.callcomposer.CallComposerFragment.CallComposerListener;
 import com.android.dialer.callcomposer.nano.CallComposerContact;
 import com.android.dialer.callcomposer.util.CopyAndResizeImageTask;
@@ -59,7 +58,6 @@ import com.android.dialer.callintent.nano.CallInitiationType;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.UiUtil;
-import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
@@ -305,7 +303,7 @@ public class CallComposerActivity extends AppCompatActivity
 
                     @Override
                     public void onCopyFailed(Throwable throwable) {
-                      // TODO(b/33753902)
+                      // TODO(b/34279096) - gracefully handle message failure
                       LogUtil.e("CallComposerActivity.onCopyFailed", "copy Failed", throwable);
                     }
                   })
@@ -473,21 +471,16 @@ public class CallComposerActivity extends AppCompatActivity
     return getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
   }
 
-  /**
-   * Populates the contact info fields based on the current contact information. Copied from {@link
-   * com.android.contacts.common.dialog.CallSubjectDialog}.
-   */
+  /** Populates the contact info fields based on the current contact information. */
   private void updateContactInfo() {
-    if (contact.contactUri != null) {
-      setPhoto(
-          contact.photoId,
-          Uri.parse(contact.photoUri),
-          Uri.parse(contact.contactUri),
-          contact.nameOrNumber,
-          contact.isBusiness);
-    } else {
-      contactPhoto.setVisibility(View.GONE);
-    }
+    ContactPhotoManager.getInstance(this)
+        .loadDialerThumbnail(
+            contactPhoto,
+            contact.contactUri == null ? null : Uri.parse(contact.contactUri),
+            contact.photoId,
+            contact.nameOrNumber,
+            contact.contactType);
+
     nameView.setText(contact.nameOrNumber);
     getActionBar().setTitle(contact.nameOrNumber);
     if (!TextUtils.isEmpty(contact.numberLabel) && !TextUtils.isEmpty(contact.displayNumber)) {
@@ -505,43 +498,6 @@ public class CallComposerActivity extends AppCompatActivity
     }
   }
 
-  /**
-   * Sets the photo on the quick contact galleryIcon. Copied from {@link
-   * com.android.contacts.common.dialog.CallSubjectDialog}.
-   */
-  private void setPhoto(
-      long photoId, Uri photoUri, Uri contactUri, String displayName, boolean isBusiness) {
-    contactPhoto.assignContactUri(contactUri);
-    if (CompatUtils.isLollipopCompatible()) {
-      contactPhoto.setOverlay(null);
-    }
-
-    int contactType;
-    if (isBusiness) {
-      contactType = ContactPhotoManager.TYPE_BUSINESS;
-    } else {
-      contactType = ContactPhotoManager.TYPE_DEFAULT;
-    }
-
-    String lookupKey = null;
-    if (contactUri != null) {
-      lookupKey = UriUtils.getLookupKeyFromUri(contactUri);
-    }
-
-    ContactPhotoManager.DefaultImageRequest request =
-        new ContactPhotoManager.DefaultImageRequest(
-            displayName, lookupKey, contactType, true /* isCircular */);
-
-    if (photoId == 0 && photoUri != null) {
-      contactPhoto.setImageDrawable(
-          getDrawable(R.drawable.product_logo_avatar_anonymous_color_120));
-    } else {
-      ContactPhotoManager.getInstance(this)
-          .loadThumbnail(
-              contactPhoto, photoId, false /* darkTheme */, true /* isCircular */, request);
-    }
-  }
-
   /** Animates compose UI into view */
   private void runEntranceAnimation() {
     if (!shouldAnimateEntrance) {
diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
index 583fb5446..ebd032199 100644
--- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
@@ -366,7 +366,10 @@ public class CameraComposerFragment extends CallComposerFragment
   @Override
   public void onSaveInstanceState(Bundle outState) {
     super.onSaveInstanceState(outState);
-    outState.putInt(CAMERA_DIRECTION_KEY, CameraManager.get().getCameraInfo().facing);
+
+    CameraInfo cameraInfo = CameraManager.get().getCameraInfo();
+    int facing = cameraInfo == null ? CameraInfo.CAMERA_FACING_BACK : cameraInfo.facing;
+    outState.putInt(CAMERA_DIRECTION_KEY, facing);
     outState.putParcelable(CAMERA_URI_KEY, cameraUri);
   }
 
diff --git a/java/com/android/dialer/callcomposer/GalleryComposerFragment.java b/java/com/android/dialer/callcomposer/GalleryComposerFragment.java
index b53d6a9d6..1d684a2d3 100644
--- a/java/com/android/dialer/callcomposer/GalleryComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/GalleryComposerFragment.java
@@ -277,14 +277,14 @@ public class GalleryComposerFragment extends CallComposerFragment
 
                 @Override
                 public void onCopyFailed(Throwable throwable) {
-                  // TODO(b/33753902)
+                  // TODO(b/34279096) - gracefully handle message failure
                   LogUtil.e(
                       "GalleryComposerFragment.onFailure", "Data preparation failed", throwable);
                 }
               })
           .execute();
     } else {
-      // TODO(b/33753902)
+      // TODO(b/34279096) - gracefully handle message failure
     }
   }
 }
diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java
index 87cd16a99..4cc08ba32 100644
--- a/java/com/android/dialer/callcomposer/camera/CameraManager.java
+++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java
@@ -23,6 +23,7 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Looper;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.view.MotionEvent;
@@ -305,6 +306,7 @@ public class CameraManager implements FocusOverlayManager.Listener {
     }
   }
 
+  @Nullable
   @VisibleForTesting
   public CameraInfo getCameraInfo() {
     if (mCameraIndex == NO_CAMERA_SELECTED) {
@@ -516,7 +518,7 @@ public class CameraManager implements FocusOverlayManager.Listener {
     final WindowManager windowManager =
         (WindowManager) mCameraPreview.getContext().getSystemService(Context.WINDOW_SERVICE);
 
-    int degrees = 0;
+    int degrees;
     switch (windowManager.getDefaultDisplay().getRotation()) {
       case Surface.ROTATION_0:
         degrees = 0;
@@ -530,6 +532,8 @@ public class CameraManager implements FocusOverlayManager.Listener {
       case Surface.ROTATION_270:
         degrees = 270;
         break;
+      default:
+        throw Assert.createAssertionFailException("");
     }
 
     // The display orientation of the camera (this controls the preview image).
diff --git a/java/com/android/dialer/callcomposer/nano/CallComposerContact.java b/java/com/android/dialer/callcomposer/nano/CallComposerContact.java
index acb71a0aa..dcda571e2 100644
--- a/java/com/android/dialer/callcomposer/nano/CallComposerContact.java
+++ b/java/com/android/dialer/callcomposer/nano/CallComposerContact.java
@@ -48,9 +48,6 @@ public final class CallComposerContact
   // optional string name_or_number = 4;
   public java.lang.String nameOrNumber;
 
-  // optional bool is_business = 5;
-  public boolean isBusiness;
-
   // optional string number = 6;
   public java.lang.String number;
 
@@ -60,6 +57,9 @@ public final class CallComposerContact
   // optional string number_label = 8;
   public java.lang.String numberLabel;
 
+  // optional int32 contact_type = 9;
+  public int contactType;
+
   // @@protoc_insertion_point(class_scope:com.android.dialer.callcomposer.CallComposerContact)
 
   public CallComposerContact() {
@@ -71,10 +71,10 @@ public final class CallComposerContact
     photoUri = "";
     contactUri = "";
     nameOrNumber = "";
-    isBusiness = false;
     number = "";
     displayNumber = "";
     numberLabel = "";
+    contactType = 0;
     unknownFieldData = null;
     cachedSize = -1;
     return this;
@@ -95,9 +95,6 @@ public final class CallComposerContact
     if (this.nameOrNumber != null && !this.nameOrNumber.equals("")) {
       output.writeString(4, this.nameOrNumber);
     }
-    if (this.isBusiness != false) {
-      output.writeBool(5, this.isBusiness);
-    }
     if (this.number != null && !this.number.equals("")) {
       output.writeString(6, this.number);
     }
@@ -107,6 +104,9 @@ public final class CallComposerContact
     if (this.numberLabel != null && !this.numberLabel.equals("")) {
       output.writeString(8, this.numberLabel);
     }
+    if (this.contactType != 0) {
+      output.writeInt32(9, this.contactType);
+    }
     super.writeTo(output);
   }
 
@@ -130,10 +130,6 @@ public final class CallComposerContact
           com.google.protobuf.nano.CodedOutputByteBufferNano.computeStringSize(
               4, this.nameOrNumber);
     }
-    if (this.isBusiness != false) {
-      size +=
-          com.google.protobuf.nano.CodedOutputByteBufferNano.computeBoolSize(5, this.isBusiness);
-    }
     if (this.number != null && !this.number.equals("")) {
       size += com.google.protobuf.nano.CodedOutputByteBufferNano.computeStringSize(6, this.number);
     }
@@ -146,6 +142,10 @@ public final class CallComposerContact
       size +=
           com.google.protobuf.nano.CodedOutputByteBufferNano.computeStringSize(8, this.numberLabel);
     }
+    if (this.contactType != 0) {
+      size +=
+          com.google.protobuf.nano.CodedOutputByteBufferNano.computeInt32Size(9, this.contactType);
+    }
     return size;
   }
 
@@ -184,11 +184,6 @@ public final class CallComposerContact
             this.nameOrNumber = input.readString();
             break;
           }
-        case 40:
-          {
-            this.isBusiness = input.readBool();
-            break;
-          }
         case 50:
           {
             this.number = input.readString();
@@ -204,6 +199,11 @@ public final class CallComposerContact
             this.numberLabel = input.readString();
             break;
           }
+        case 72:
+          {
+            this.contactType = input.readInt32();
+            break;
+          }
       }
     }
   }
diff --git a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java
index b1a70af0c..55447f8ff 100644
--- a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java
@@ -17,9 +17,6 @@
 package com.android.dialer.calldetails;
 
 import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.provider.CallLog.Calls;
 import android.support.annotation.ColorInt;
@@ -33,10 +30,12 @@ import android.widget.TextView;
 import com.android.dialer.calldetails.nano.CallDetailsEntries.CallDetailsEntry;
 import com.android.dialer.calllogutils.CallEntryFormatter;
 import com.android.dialer.calllogutils.CallTypeHelper;
+import com.android.dialer.calllogutils.CallTypeIconsView;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.AppCompatConstants;
 import com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult;
 import com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult.Type;
+import com.android.dialer.oem.MotorolaUtils;
 import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
@@ -44,7 +43,7 @@ import com.android.dialer.util.IntentUtil;
 /** ViewHolder for call entries in {@link CallDetailsActivity}. */
 public class CallDetailsEntryViewHolder extends ViewHolder {
 
-  private final ImageView callTypeIcon;
+  private final CallTypeIconsView callTypeIcon;
   private final TextView callTypeText;
   private final TextView callTime;
   private final TextView callDuration;
@@ -54,6 +53,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder {
   private final View multimediaDivider;
 
   private final TextView multimediaDetails;
+  private final TextView postCallNote;
 
   private final ImageView multimediaImage;
 
@@ -67,7 +67,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder {
     super(container);
     context = container.getContext();
 
-    callTypeIcon = (ImageView) container.findViewById(R.id.call_direction);
+    callTypeIcon = (CallTypeIconsView) container.findViewById(R.id.call_direction);
     callTypeText = (TextView) container.findViewById(R.id.call_type);
     callTime = (TextView) container.findViewById(R.id.call_time);
     callDuration = (TextView) container.findViewById(R.id.call_duration);
@@ -76,6 +76,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder {
     multimediaDetailsContainer = container.findViewById(R.id.ec_container);
     multimediaDivider = container.findViewById(R.id.divider);
     multimediaDetails = (TextView) container.findViewById(R.id.multimedia_details);
+    postCallNote = (TextView) container.findViewById(R.id.post_call_note);
     multimediaImage = (ImageView) container.findViewById(R.id.multimedia_image);
     multimediaAttachmentsNumber =
         (TextView) container.findViewById(R.id.multimedia_attachments_number);
@@ -93,11 +94,10 @@ public class CallDetailsEntryViewHolder extends ViewHolder {
     boolean isPulledCall =
         (entry.features & Calls.FEATURES_PULLED_EXTERNALLY) == Calls.FEATURES_PULLED_EXTERNALLY;
 
-    Drawable callIcon = getIconForCallType(context.getResources(), callType);
-    int color = getColorForCallType(context, callType);
-    callIcon.setColorFilter(color, PorterDuff.Mode.MULTIPLY);
-    callTime.setTextColor(color);
-    callTypeIcon.setImageDrawable(callIcon);
+    callTime.setTextColor(getColorForCallType(context, callType));
+    callTypeIcon.add(callType);
+    callTypeIcon.setShowVideo((entry.features & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO);
+    callTypeIcon.setShowHd(MotorolaUtils.shouldShowHdIconInCallLog(context, entry.features));
 
     callTypeText.setText(callTypeHelper.getCallTypeText(callType, isVideoCall, isPulledCall));
     callTime.setText(CallEntryFormatter.formatDate(context, entry.date));
@@ -118,8 +118,6 @@ public class CallDetailsEntryViewHolder extends ViewHolder {
       multimediaDetailsContainer.setVisibility(View.GONE);
     } else {
 
-      // TODO: b/36158891 Add room for 2 pieces of enriched call data. It's possible
-      // to have both call composer data and post call data for a single call.
       HistoryResult historyResult = entry.historyResults[0];
       multimediaDetailsContainer.setVisibility(View.VISIBLE);
       multimediaDetailsContainer.setOnClickListener(
@@ -146,6 +144,15 @@ public class CallDetailsEntryViewHolder extends ViewHolder {
       } else {
         LogUtil.i("CallDetailsEntryViewHolder.setMultimediaDetails", "no text");
       }
+
+      if (entry.historyResults.length > 1 && !TextUtils.isEmpty(entry.historyResults[1].text)) {
+        LogUtil.i("CallDetailsEntryViewHolder.setMultimediaDetails", "showing post call note");
+        postCallNote.setVisibility(View.VISIBLE);
+        postCallNote.setText(
+            context.getString(R.string.message_in_quotes, entry.historyResults[1].text));
+      } else {
+        LogUtil.i("CallDetailsEntryViewHolder.setMultimediaDetails", "no post call note");
+      }
     }
   }
 
@@ -154,26 +161,6 @@ public class CallDetailsEntryViewHolder extends ViewHolder {
         || historyResult.type == Type.INCOMING_CALL_COMPOSER;
   }
 
-  private static Drawable getIconForCallType(Resources resources, int callType) {
-    switch (callType) {
-      case AppCompatConstants.CALLS_OUTGOING_TYPE:
-        return resources.getDrawable(R.drawable.quantum_ic_call_made_white_24);
-      case AppCompatConstants.CALLS_BLOCKED_TYPE:
-        return resources.getDrawable(R.drawable.quantum_ic_block_white_24);
-      case AppCompatConstants.CALLS_INCOMING_TYPE:
-      case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE:
-      case AppCompatConstants.CALLS_REJECTED_TYPE:
-        return resources.getDrawable(R.drawable.quantum_ic_call_received_white_24);
-      case AppCompatConstants.CALLS_MISSED_TYPE:
-      default:
-        // It is possible for users to end up with calls with unknown call types in their
-        // call history, possibly due to 3rd party call log implementations (e.g. to
-        // distinguish between rejected and missed calls). Instead of crashing, just
-        // assume that all unknown call types are missed calls.
-        return resources.getDrawable(R.drawable.quantum_ic_call_missed_white_24);
-    }
-  }
-
   private static @ColorInt int getColorForCallType(Context context, int callType) {
     switch (callType) {
       case AppCompatConstants.CALLS_OUTGOING_TYPE:
diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
index 1679c2baf..416c521a2 100644
--- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
@@ -25,7 +25,6 @@ import android.view.View.OnClickListener;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
 import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.callcomposer.nano.CallComposerContact;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.callintent.nano.CallInitiationType;
@@ -56,18 +55,16 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder
     callBackButton.setOnClickListener(this);
   }
 
-  /**
-   * Populates the contact info fields based on the current contact information. Copied from {@link
-   * com.android.contacts.common.dialog.CallSubjectDialog}.
-   */
+  /** Populates the contact info fields based on the current contact information. */
   public void updateContactInfo(CallComposerContact contact) {
     this.contact = contact;
-    setPhoto(
-        contact.photoId,
-        Uri.parse(contact.photoUri),
-        Uri.parse(contact.contactUri),
-        contact.nameOrNumber,
-        contact.isBusiness);
+    ContactPhotoManager.getInstance(context)
+        .loadDialerThumbnail(
+            contactPhoto,
+            contact.contactUri == null ? null : Uri.parse(contact.contactUri),
+            contact.photoId,
+            contact.nameOrNumber,
+            contact.contactType);
 
     nameView.setText(contact.nameOrNumber);
     if (!TextUtils.isEmpty(contact.numberLabel) && !TextUtils.isEmpty(contact.displayNumber)) {
@@ -84,33 +81,6 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder
     }
   }
 
-  /**
-   * Sets the photo on the quick contact galleryIcon. Copied from {@link
-   * com.android.contacts.common.dialog.CallSubjectDialog}.
-   */
-  private void setPhoto(
-      long photoId, Uri photoUri, Uri contactUri, String displayName, boolean isBusiness) {
-    contactPhoto.assignContactUri(contactUri);
-    contactPhoto.setOverlay(null);
-
-    int contactType =
-        isBusiness ? ContactPhotoManager.TYPE_BUSINESS : ContactPhotoManager.TYPE_DEFAULT;
-    String lookupKey = contactUri == null ? null : UriUtils.getLookupKeyFromUri(contactUri);
-
-    ContactPhotoManager.DefaultImageRequest request =
-        new ContactPhotoManager.DefaultImageRequest(
-            displayName, lookupKey, contactType, true /* isCircular */);
-
-    if (photoId == 0 && photoUri != null) {
-      contactPhoto.setImageDrawable(
-          context.getDrawable(R.drawable.product_logo_avatar_anonymous_color_120));
-    } else {
-      ContactPhotoManager.getInstance(context)
-          .loadThumbnail(
-              contactPhoto, photoId, false /* darkTheme */, true /* isCircular */, request);
-    }
-  }
-
   @Override
   public void onClick(View view) {
     if (view == callBackButton) {
diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml
index 7f8bb8087..3f2ba7534 100644
--- a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml
+++ b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml
@@ -16,29 +16,30 @@
   -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/call_entry_padding">
 
-  <ImageView
+  <com.android.dialer.calllogutils.CallTypeIconsView
       android:id="@+id/call_direction"
-      android:layout_width="@dimen/call_entry_icon_size"
-      android:layout_height="@dimen/call_entry_icon_size"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
       android:layout_marginStart="@dimen/call_entry_padding"
-      android:layout_marginEnd="@dimen/call_entry_left_margin"/>
+      app:useLargeIcons="true"/>
 
   <TextView
       android:id="@+id/call_type"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_toEndOf="@+id/call_direction"
+      android:layout_marginStart="@dimen/call_entry_text_left_margin"
       style="@style/PrimaryText"/>
 
   <TextView
       android:id="@+id/call_time"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_toEndOf="@id/call_direction"
+      android:layout_marginStart="@dimen/call_entry_text_left_margin"
       android:layout_below="@+id/call_type"
       android:layout_marginBottom="@dimen/call_entry_bottom_padding"
       style="@style/SecondaryText"/>
@@ -56,18 +57,29 @@
       android:id="@+id/ec_container"
       android:layout_height="@dimen/ec_container_height"
       android:layout_width="match_parent"
-      android:layout_marginStart="@dimen/ec_text_left_margin"
+      android:layout_marginStart="@dimen/call_entry_text_left_margin"
       android:layout_below="@+id/call_time"
       android:visibility="gone"/>
 
+  <TextView
+      android:id="@+id/post_call_note"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/ec_container_height"
+      android:gravity="center_vertical"
+      android:layout_marginStart="@dimen/ec_post_call_left_margin"
+      android:maxLines="2"
+      android:visibility="gone"
+      android:layout_below="@+id/ec_container"
+      style="@style/SecondaryText"/>
+
   <View
       android:id="@+id/divider"
       android:layout_width="match_parent"
       android:layout_height="1dp"
-      android:layout_below="@id/ec_container"
+      android:layout_below="@id/post_call_note"
       android:layout_marginTop="@dimen/ec_divider_top_bottom_margin"
       android:layout_marginBottom="@dimen/ec_divider_top_bottom_margin"
-      android:layout_marginStart="@dimen/ec_text_left_margin"
+      android:layout_marginStart="@dimen/call_entry_text_left_margin"
       android:background="#12000000"
       android:visibility="gone"/>
 </RelativeLayout>
 \ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/res/values/dimens.xml b/java/com/android/dialer/calldetails/res/values/dimens.xml
index 59f237103..2ca7ea83a 100644
--- a/java/com/android/dialer/calldetails/res/values/dimens.xml
+++ b/java/com/android/dialer/calldetails/res/values/dimens.xml
@@ -29,12 +29,12 @@
   <dimen name="call_entry_icon_size">24dp</dimen>
   <dimen name="call_entry_padding">16dp</dimen>
   <dimen name="call_entry_bottom_padding">14dp</dimen>
-  <dimen name="call_entry_left_margin">32dp</dimen>
+  <dimen name="call_entry_text_left_margin">72dp</dimen>
 
   <!-- EC container -->
   <dimen name="call_details_ec_text_size">12sp</dimen>
   <dimen name="ec_container_height">48dp</dimen>
-  <dimen name="ec_text_left_margin">72dp</dimen>
+  <dimen name="ec_post_call_left_margin">73dp</dimen>
   <dimen name="ec_photo_size">40dp</dimen>
   <dimen name="ec_divider_top_bottom_margin">8dp</dimen>
 </resources>
 \ No newline at end of file
diff --git a/java/com/android/dialer/calllogutils/CallTypeIconsView.java b/java/com/android/dialer/calllogutils/CallTypeIconsView.java
index 61208bc9a..5644dc865 100644
--- a/java/com/android/dialer/calllogutils/CallTypeIconsView.java
+++ b/java/com/android/dialer/calllogutils/CallTypeIconsView.java
@@ -17,6 +17,7 @@
 package com.android.dialer.calllogutils;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -32,12 +33,18 @@ import java.util.List;
 
 /**
  * View that draws one or more symbols for different types of calls (missed calls, outgoing etc).
- * The symbols are set up horizontally. As this view doesn't create subviews, it is better suited
- * for ListView-recycling that a regular LinearLayout using ImageViews.
+ * The symbols are set up horizontally. If {@code useLargeIcons} is set in the xml attributes,
+ * alternatively this view will only render one icon (Call Type, HD or Video).
+ *
+ * <p>As this view doesn't create subviews, it is better suited for ListView-recycling than a
+ * regular LinearLayout using ImageViews.
  */
 public class CallTypeIconsView extends View {
 
+  private final boolean useLargeIcons;
+
   private static Resources sResources;
+  private static Resources sLargeResouces;
   private List<Integer> mCallTypes = new ArrayList<>(3);
   private boolean mShowVideo = false;
   private boolean mShowHd = false;
@@ -50,8 +57,15 @@ public class CallTypeIconsView extends View {
 
   public CallTypeIconsView(Context context, AttributeSet attrs) {
     super(context, attrs);
+    TypedArray typedArray =
+        context.getTheme().obtainStyledAttributes(attrs, R.styleable.CallTypeIconsView, 0, 0);
+    useLargeIcons = typedArray.getBoolean(R.styleable.CallTypeIconsView_useLargeIcons, false);
+    typedArray.recycle();
     if (sResources == null) {
-      sResources = new Resources(context);
+      sResources = new Resources(context, false);
+    }
+    if (sLargeResouces == null && useLargeIcons) {
+      sLargeResouces = new Resources(context, true);
     }
   }
 
@@ -67,7 +81,7 @@ public class CallTypeIconsView extends View {
 
     final Drawable drawable = getCallTypeDrawable(callType);
     mWidth += drawable.getIntrinsicWidth() + sResources.iconMargin;
-    mHeight = Math.max(mHeight, drawable.getIntrinsicHeight());
+    mHeight = Math.max(mHeight, drawable.getIntrinsicWidth());
     invalidate();
   }
 
@@ -112,24 +126,25 @@ public class CallTypeIconsView extends View {
   }
 
   private Drawable getCallTypeDrawable(int callType) {
+    Resources resources = useLargeIcons ? sLargeResouces : sResources;
     switch (callType) {
       case AppCompatConstants.CALLS_INCOMING_TYPE:
       case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE:
-        return sResources.incoming;
+        return resources.incoming;
       case AppCompatConstants.CALLS_OUTGOING_TYPE:
-        return sResources.outgoing;
+        return resources.outgoing;
       case AppCompatConstants.CALLS_MISSED_TYPE:
-        return sResources.missed;
+        return resources.missed;
       case AppCompatConstants.CALLS_VOICEMAIL_TYPE:
-        return sResources.voicemail;
+        return resources.voicemail;
       case AppCompatConstants.CALLS_BLOCKED_TYPE:
-        return sResources.blocked;
+        return resources.blocked;
       default:
         // It is possible for users to end up with calls with unknown call types in their
         // call history, possibly due to 3rd party call log implementations (e.g. to
         // distinguish between rejected and missed calls). Instead of crashing, just
         // assume that all unknown call types are missed calls.
-        return sResources.missed;
+        return resources.missed;
     }
   }
 
@@ -140,27 +155,32 @@ public class CallTypeIconsView extends View {
 
   @Override
   protected void onDraw(Canvas canvas) {
+    Resources resources = useLargeIcons ? sLargeResouces : sResources;
     int left = 0;
-    for (Integer callType : mCallTypes) {
-      final Drawable drawable = getCallTypeDrawable(callType);
-      final int right = left + drawable.getIntrinsicWidth();
-      drawable.setBounds(left, 0, right, drawable.getIntrinsicHeight());
-      drawable.draw(canvas);
-      left = right + sResources.iconMargin;
+    // If we are using large icons, we should only show one icon (video, hd or call type) with
+    // priority give to HD or Video. So we skip the call type icon if we plan to show them.
+    if (!useLargeIcons || !(mShowHd || mShowVideo)) {
+      for (Integer callType : mCallTypes) {
+        final Drawable drawable = getCallTypeDrawable(callType);
+        final int right = left + drawable.getIntrinsicWidth();
+        drawable.setBounds(left, 0, right, drawable.getIntrinsicHeight());
+        drawable.draw(canvas);
+        left = right + resources.iconMargin;
+      }
     }
 
     // If showing the video call icon, draw it scaled appropriately.
     if (mShowVideo) {
-      final Drawable drawable = sResources.videoCall;
-      final int right = left + sResources.videoCall.getIntrinsicWidth();
-      drawable.setBounds(left, 0, right, sResources.videoCall.getIntrinsicHeight());
+      final Drawable drawable = resources.videoCall;
+      final int right = left + resources.videoCall.getIntrinsicWidth();
+      drawable.setBounds(left, 0, right, resources.videoCall.getIntrinsicHeight());
       drawable.draw(canvas);
     }
     // If showing HD call icon, draw it scaled appropriately.
     if (mShowHd) {
-      final Drawable drawable = sResources.hdCall;
-      final int right = left + sResources.hdCall.getIntrinsicWidth();
-      drawable.setBounds(left, 0, right, sResources.hdCall.getIntrinsicHeight());
+      final Drawable drawable = resources.hdCall;
+      final int right = left + resources.hdCall.getIntrinsicWidth();
+      drawable.setBounds(left, 0, right, resources.hdCall.getIntrinsicHeight());
       drawable.draw(canvas);
     }
   }
@@ -197,37 +217,44 @@ public class CallTypeIconsView extends View {
      *
      * @param context The current context.
      */
-    public Resources(Context context) {
+    public Resources(Context context, boolean largeIcons) {
       final android.content.res.Resources r = context.getResources();
 
-      incoming = r.getDrawable(R.drawable.ic_call_arrow);
+      int iconId =
+          largeIcons ? R.drawable.quantum_ic_call_received_white_24 : R.drawable.ic_call_arrow;
+      incoming = r.getDrawable(iconId);
       incoming.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY);
 
       // Create a rotated instance of the call arrow for outgoing calls.
-      outgoing = BitmapUtil.getRotatedDrawable(r, R.drawable.ic_call_arrow, 180f);
+      outgoing = BitmapUtil.getRotatedDrawable(r, iconId, 180f);
       outgoing.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY);
 
       // Need to make a copy of the arrow drawable, otherwise the same instance colored
       // above will be recolored here.
-      missed = r.getDrawable(R.drawable.ic_call_arrow).mutate();
+      iconId = largeIcons ? R.drawable.quantum_ic_call_missed_white_24 : R.drawable.ic_call_arrow;
+      missed = r.getDrawable(iconId).mutate();
       missed.setColorFilter(r.getColor(R.color.missed_call), PorterDuff.Mode.MULTIPLY);
 
-      voicemail = r.getDrawable(R.drawable.quantum_ic_voicemail_white_18);
+      iconId = R.drawable.quantum_ic_voicemail_white_24;
+      voicemail = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       voicemail.setColorFilter(
           r.getColor(R.color.dialer_secondary_text_color), PorterDuff.Mode.MULTIPLY);
 
-      blocked = getScaledBitmap(context, R.drawable.ic_block_24dp);
+      iconId = R.drawable.quantum_ic_block_white_24;
+      blocked = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       blocked.setColorFilter(r.getColor(R.color.blocked_call), PorterDuff.Mode.MULTIPLY);
 
-      videoCall = getScaledBitmap(context, R.drawable.quantum_ic_videocam_white_24);
+      iconId = R.drawable.quantum_ic_videocam_white_24;
+      videoCall = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       videoCall.setColorFilter(
           r.getColor(R.color.dialer_secondary_text_color), PorterDuff.Mode.MULTIPLY);
 
-      hdCall = getScaledBitmap(context, R.drawable.quantum_ic_hd_white_24);
+      iconId = R.drawable.quantum_ic_hd_white_24;
+      hdCall = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       hdCall.setColorFilter(
           r.getColor(R.color.dialer_secondary_text_color), PorterDuff.Mode.MULTIPLY);
 
-      iconMargin = r.getDimensionPixelSize(R.dimen.call_log_icon_margin);
+      iconMargin = largeIcons ? 0 : r.getDimensionPixelSize(R.dimen.call_log_icon_margin);
     }
 
     // Gets the icon, scaled to the height of the call type icons. This helps display all the
diff --git a/java/com/android/dialer/calllogutils/res/values-af/strings.xml b/java/com/android/dialer/calllogutils/res/values-af/strings.xml
index 6c85ef2ad..d4d615e79 100644
--- a/java/com/android/dialer/calllogutils/res/values-af/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-af/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"op <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Stemboodskap"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> m. <xliff:g id="SECONDS">%s</xliff:g> s."</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s."</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-am/strings.xml b/java/com/android/dialer/calllogutils/res/values-am/strings.xml
index 725f3ecca..80a71c93f 100644
--- a/java/com/android/dialer/calllogutils/res/values-am/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-am/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"በ <xliff:g id="NUMBER">%1$s</xliff:g> በኩል"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"በ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ላይ፣ በ <xliff:g id="NUMBER">%2$s</xliff:g> በኩል"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"የድምፅ መልእክት"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>ደ <xliff:g id="SECONDS">%s</xliff:g>ሰ"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> ሰከንዶች"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml
index 1093e3854..04cc6d9ac 100644
--- a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"من خلال <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"على <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> من خلال <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"البريد الصوتي"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> د <xliff:g id="SECONDS">%s</xliff:g> ث"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> ثانية"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-az/strings.xml b/java/com/android/dialer/calllogutils/res/values-az/strings.xml
index c47892692..76726120c 100644
--- a/java/com/android/dialer/calllogutils/res/values-az/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-az/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> vasitəsilə"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="NUMBER">%2$s</xliff:g> vasitəsilə <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> hesabında"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Səsli e-məktub"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> dəq <xliff:g id="SECONDS">%s</xliff:g> san"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>san"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-be/strings.xml b/java/com/android/dialer/calllogutils/res/values-be/strings.xml
index 00ec0a7ba..fbb7bf24b 100644
--- a/java/com/android/dialer/calllogutils/res/values-be/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-be/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"праз <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, праз <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Галасавая пошта"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> хв <xliff:g id="SECONDS">%s</xliff:g> с"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> с"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml
index afa60484c..4f21eb3f3 100644
--- a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"през <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"в/ъв <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, през <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Гласова поща"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml
index be386d6b2..28b40b448 100644
--- a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> এর মাধ্যমে"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> এ, <xliff:g id="NUMBER">%2$s</xliff:g> এর মাধ্যমে"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ভয়েসমেল"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>মিনিট <xliff:g id="SECONDS">%s</xliff:g>সেকেন্ড"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>সেকেন্ড"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml
index a6d8ec6b0..c6693d364 100644
--- a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"preko <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"na <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, preko <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Govorna pošta"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml
index ff620ea14..45b581423 100644
--- a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"al número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"a <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, al número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Bústia de veu"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml
index 4fd66dab5..f2de1f887 100644
--- a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"z čísla <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"na účet <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, z čísla <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Hlasová schránka"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-da/strings.xml b/java/com/android/dialer/calllogutils/res/values-da/strings.xml
index 0dc317f91..09f5b3d77 100644
--- a/java/com/android/dialer/calllogutils/res/values-da/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-da/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"til <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Telefonsvarer"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-de/strings.xml b/java/com/android/dialer/calllogutils/res/values-de/strings.xml
index 8b7edd81e..b71487432 100644
--- a/java/com/android/dialer/calllogutils/res/values-de/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-de/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"über <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"mit <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, über <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Mailbox"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-el/strings.xml b/java/com/android/dialer/calllogutils/res/values-el/strings.xml
index 58d146802..ab9b5e3ee 100644
--- a/java/com/android/dialer/calllogutils/res/values-el/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-el/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"μέσω <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"στον λογαριασμό <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, μέσω <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Αυτόματος τηλεφωνητής"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>λ <xliff:g id="SECONDS">%s</xliff:g>δ"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>δ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml
index c47d8d8c6..c1105afcc 100644
--- a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"on <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>m <xliff:g id="SECONDS">%s</xliff:g>s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml
index c47d8d8c6..c1105afcc 100644
--- a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"on <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>m <xliff:g id="SECONDS">%s</xliff:g>s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml
index c47d8d8c6..c1105afcc 100644
--- a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"on <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>m <xliff:g id="SECONDS">%s</xliff:g>s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml
index 59a2f087b..003cc5430 100644
--- a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"por medio de <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"en <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> por medio de <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Buzón de voz"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min. y <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-es/strings.xml b/java/com/android/dialer/calllogutils/res/values-es/strings.xml
index 8243a49bc..9ed0b6472 100644
--- a/java/com/android/dialer/calllogutils/res/values-es/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-es/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"a través del <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"en <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, a través del <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Buzón de voz"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-et/strings.xml b/java/com/android/dialer/calllogutils/res/values-et/strings.xml
index b92821e37..a6a8b9115 100644
--- a/java/com/android/dialer/calllogutils/res/values-et/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-et/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"numbri <xliff:g id="NUMBER">%1$s</xliff:g> kaudu"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"kontol <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, numbri <xliff:g id="NUMBER">%2$s</xliff:g> kaudu"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Kõnepost"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml
index e80177743..8dfe88e09 100644
--- a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> bidez"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> kontuan, <xliff:g id="NUMBER">%2$s</xliff:g> bidez"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Erantzungailua"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min, <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml
index 06f053492..adb3d9d21 100644
--- a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"ازطریق <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"در <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>، ازطریق <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"پست صوتی"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> دقیقه <xliff:g id="SECONDS">%s</xliff:g> ثانیه"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> ثانیه"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml
index 8a19e89c6..2838e0d0e 100644
--- a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"numerosta <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"tililtä <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> numerosta <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Vastaaja"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml
index 58fc07f59..bf4ba171c 100644
--- a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"au <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"sur <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, au <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Messagerie vocale"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min et <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml
index 7050171b2..584c53ad4 100644
--- a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"au <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"sur <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, au <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Messagerie vocale"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min et <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml
index afc2ec544..ace85e49b 100644
--- a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"a través do <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"en <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, a través do <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Correo de voz"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml
index 4435d61aa..0e8e0212c 100644
--- a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> મારફતે"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> પર, <xliff:g id="NUMBER">%2$s</xliff:g> મારફતે"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"વૉઇસમેઇલ"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>મિ <xliff:g id="SECONDS">%s</xliff:g>સે"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>સે"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml
index f8ddd23a7..59a6aff7b 100644
--- a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> से"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> पर, <xliff:g id="NUMBER">%2$s</xliff:g> से"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"वॉइसमेल"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> मि <xliff:g id="SECONDS">%s</xliff:g> से"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> से"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml
index 9bb60d6e5..38843f15b 100644
--- a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"putem broja <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"na računu <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, putem broja <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Govorna pošta"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml
index 65eb6bd17..e2849b1de 100644
--- a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"szám: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"fiók: <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, szám: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Hangposta"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> p <xliff:g id="SECONDS">%s</xliff:g> mp"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> mp"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml
index f65fc11cc..58d51a6be 100644
--- a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> համարից"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>-ին <xliff:g id="NUMBER">%2$s</xliff:g> համարից"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Ձայնային փոստ"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> ր <xliff:g id="SECONDS">%s</xliff:g> վ"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> վ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-in/strings.xml b/java/com/android/dialer/calllogutils/res/values-in/strings.xml
index aaff08b49..faf93627c 100644
--- a/java/com/android/dialer/calllogutils/res/values-in/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-in/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"melalui <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"di <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, melalui <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Pesan suara"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>m <xliff:g id="SECONDS">%s</xliff:g>d"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>d"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-is/strings.xml b/java/com/android/dialer/calllogutils/res/values-is/strings.xml
index 6e15b1ae5..e7bbbe10e 100644
--- a/java/com/android/dialer/calllogutils/res/values-is/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-is/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"í gegnum <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"á <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, í gegnum <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Talhólf"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> mín. og <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-it/strings.xml b/java/com/android/dialer/calllogutils/res/values-it/strings.xml
index 8794911b7..04a0e1b39 100644
--- a/java/com/android/dialer/calllogutils/res/values-it/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-it/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"tramite <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"su <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, tramite <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Messaggi vocali"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> m <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml
index 10be3247f..1df6961c5 100644
--- a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"דרך <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"בחשבון <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, דרך <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"דואר קולי"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> דקות ו-<xliff:g id="SECONDS">%s</xliff:g> שניות"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> שניות"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
index 75eda0ca2..4baeecc5a 100644
--- a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> で受信"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>（<xliff:g id="NUMBER">%2$s</xliff:g>）で受信"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ボイスメール"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml
index 0e6fb128c..b1a4a4177 100644
--- a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g>-ის მეშვეობით"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>-ზე, <xliff:g id="NUMBER">%2$s</xliff:g>-ის მეშვეობით"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ხმოვანი ფოსტა"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>წთ <xliff:g id="SECONDS">%s</xliff:g>წმ"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>წმ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml
index 02b938f05..efaef2323 100644
--- a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> арқылы"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> арқылы"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Дауыстық хабар"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>м <xliff:g id="SECONDS">%s</xliff:g>с"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> с"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-km/strings.xml b/java/com/android/dialer/calllogutils/res/values-km/strings.xml
index d53f7d70f..b5e6c5d8e 100644
--- a/java/com/android/dialer/calllogutils/res/values-km/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-km/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"តាមរយៈ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"នៅលើ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> តាមរយៈ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"សារជាសំឡេង"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>m <xliff:g id="SECONDS">%s</xliff:g>s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml
index 60c29e809..44feee9e3 100644
--- a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> ಮೂಲಕ"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ರಲ್ಲಿ, <xliff:g id="NUMBER">%2$s</xliff:g> ಮೂಲಕ"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ಧ್ವನಿಮೇಲ್"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>ನಿ <xliff:g id="SECONDS">%s</xliff:g>ಸೆ"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>ಸೆ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml
index 2a4ef32af..76ba89b8a 100644
--- a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g>번으로 수신"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>에서 <xliff:g id="NUMBER">%2$s</xliff:g>번으로 수신"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"음성사서함"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>분 <xliff:g id="SECONDS">%s</xliff:g>초"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>초"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml
index 4ad92db5b..a91f0bd45 100644
--- a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> аркылуу"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> боюнча <xliff:g id="NUMBER">%2$s</xliff:g> аркылуу"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Үн почтасы"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>мүн. <xliff:g id="SECONDS">%s</xliff:g>сек."</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>сек."</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml
index 5e7a714fa..343fc60dd 100644
--- a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"ຜ່ານ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"ຢູ່ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, ຜ່ານ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ຂໍ້ຄວາມສຽງ"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>ນທ <xliff:g id="SECONDS">%s</xliff:g>ວິ"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>ວິ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml
index 8e4597317..779e95267 100644
--- a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"numeriu <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, numeriu <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Balso paštas"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml
index 5e292e10e..d02d7ec3a 100644
--- a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"izmantojot numuru <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"kontā <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, izmantojot numuru <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Balss pasts"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml
index 1ad4749a5..21872a817 100644
--- a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"на <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, на <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Говорна пошта"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> мин. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml
index f09aacd4c..f6507ae16 100644
--- a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> നമ്പർ വഴി"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="NUMBER">%2$s</xliff:g> നമ്പർ വഴി, <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> അക്കൗണ്ടിൽ"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"വോയ്‌സ്‌മെയിൽ"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>മിനിറ്റ് <xliff:g id="SECONDS">%s</xliff:g>സെക്കന്‍ഡ്"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>സെക്കൻഡ്"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml
index ccc473eb4..3f5bbd3ea 100644
--- a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g>-р"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> дээр, <xliff:g id="NUMBER">%2$s</xliff:g>-р"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Дуут шуудан"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>м <xliff:g id="SECONDS">%s</xliff:g>с"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>с"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml
index 5d5d1bb6c..893851f69 100644
--- a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> द्वारे"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> वर, <xliff:g id="NUMBER">%2$s</xliff:g> द्वारे"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"व्हॉइसमेल"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>मि <xliff:g id="SECONDS">%s</xliff:g>से"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>से"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml
index a2f003617..1f7a22127 100644
--- a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"melalui <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"pada <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, melalui <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Mel suara"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>m <xliff:g id="SECONDS">%s</xliff:g>s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-my/strings.xml b/java/com/android/dialer/calllogutils/res/values-my/strings.xml
index c2022327e..8b1337e01 100644
--- a/java/com/android/dialer/calllogutils/res/values-my/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-my/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> မှတစ်ဆင့်"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> တွင်၊ <xliff:g id="NUMBER">%2$s</xliff:g> မှတစ်ဆင့်"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"အသံမေးလ်"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>မိနစ် <xliff:g id="SECONDS">%s</xliff:g>စက္ကန့်"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>စက္ကန့်"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml
index e988e4f58..7d4622004 100644
--- a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"på <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Talepost"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> m og <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml
index a9ee59b11..d498395f0 100644
--- a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> मार्फत"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> मा, <xliff:g id="NUMBER">%2$s</xliff:g> मार्फत"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"भ्वाइस मेल"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>मिनेट <xliff:g id="SECONDS">%s</xliff:g>सेकेन्ड"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>सेकेन्ड"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml
index 6c51676cf..0fcc6ca7f 100644
--- a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"op <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> m <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-no/strings.xml b/java/com/android/dialer/calllogutils/res/values-no/strings.xml
index e988e4f58..7d4622004 100644
--- a/java/com/android/dialer/calllogutils/res/values-no/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-no/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"på <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Talepost"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> m og <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml
index ecb1998fb..f4cde52ff 100644
--- a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> ਰਾਹੀਂ"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> \'ਤੇ, <xliff:g id="NUMBER">%2$s</xliff:g> ਰਾਹੀਂ"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ਵੌਇਸਮੇਲ"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>ਮਿੰ <xliff:g id="SECONDS">%s</xliff:g>ਸਕਿੰ"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>ਸਕਿੰ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml
index 7fcdd7511..f1396cd88 100644
--- a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"przez <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"na koncie <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, przez <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Poczta głosowa"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml
index 127514b6d..1e8b733b9 100644
--- a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"pelo número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"em <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, pelo número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Correio de voz"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml
index 45c5a6003..1a2fa4c01 100644
--- a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"através do número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"em <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, através do número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Correio de voz"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> seg"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> seg"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml
index 127514b6d..1e8b733b9 100644
--- a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"pelo número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"em <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, pelo número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Correio de voz"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml
index 59cb76725..84497540b 100644
--- a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"prin <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"pe <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, prin <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Mesagerie vocală"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sec."</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> sec."</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml
index 99a656803..8e6120ab1 100644
--- a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"Номер <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, номер <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Голосовая почта"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> мин. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-si/strings.xml b/java/com/android/dialer/calllogutils/res/values-si/strings.xml
index 841f5caca..fa24c1c07 100644
--- a/java/com/android/dialer/calllogutils/res/values-si/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-si/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> හරහා"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> මත, <xliff:g id="NUMBER">%2$s</xliff:g> හරහා"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"හඬ තැපෑල"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"මි<xliff:g id="MINUTES">%s</xliff:g> ත<xliff:g id="SECONDS">%s</xliff:g>"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"තත්<xliff:g id="SECONDS">%s</xliff:g>"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml
index 1e1b86811..ee32a0875 100644
--- a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"prostredníctvom čísla <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"v účte <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, prostredníctvom čísla <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Hlasová schránka"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml
index 945cecc9c..0cf0ab2ca 100644
--- a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"prek številke <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"v računu <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, prek številke <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Odzivnik"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml
index 229a3879f..b2a28357c 100644
--- a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"nëpërmjet <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"në <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, nëpërmjet <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Posta zanore"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> minuta e <xliff:g id="SECONDS">%s</xliff:g> sekonda"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> sekonda"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml
index 696f3d31c..49f7473d4 100644
--- a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"преко <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, преко <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Говорна пошта"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> м <xliff:g id="SECONDS">%s</xliff:g> с"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> с"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml
index 8fb59d115..eff7210ef 100644
--- a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"med <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"på <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, med <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Röstbrevlåda"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> m <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml
index de161bcbc..7810fb14b 100644
--- a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"kupitia <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"kwenye <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, kupitia <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Ujumbe wa sauti"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"Dakika <xliff:g id="MINUTES">%s</xliff:g> sekunde <xliff:g id="SECONDS">%s</xliff:g>"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"Sekunde <xliff:g id="SECONDS">%s</xliff:g>"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml
index 6ff5c525f..b3e60bbc8 100644
--- a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> மூலம்"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> இல் <xliff:g id="NUMBER">%2$s</xliff:g> மூலம்"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"குரலஞ்சல்"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>நி <xliff:g id="SECONDS">%s</xliff:g>வி"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>வி"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-te/strings.xml b/java/com/android/dialer/calllogutils/res/values-te/strings.xml
index 05f9addee..4d6553765 100644
--- a/java/com/android/dialer/calllogutils/res/values-te/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-te/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> ద్వారా"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>లో, <xliff:g id="NUMBER">%2$s</xliff:g> ద్వారా"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"వాయిస్ మెయిల్"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>ని <xliff:g id="SECONDS">%s</xliff:g>సె"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>సె"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-th/strings.xml b/java/com/android/dialer/calllogutils/res/values-th/strings.xml
index 35ec52d62..46d9ec028 100644
--- a/java/com/android/dialer/calllogutils/res/values-th/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-th/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"ผ่าน <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"ใน <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ผ่าน <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ข้อความเสียง"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> นาที <xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml
index 62cda0d19..b4f4045e3 100644
--- a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"sa pamamagitan ng <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"sa <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, sa pamamagitan ng <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> (na) min. <xliff:g id="SECONDS">%s</xliff:g> (na) segundo"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> (na) segundo"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml
index 490a8ed02..1a2e762f1 100644
--- a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> kullanılarak"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="NUMBER">%2$s</xliff:g> kullanılarak <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> hesabında"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Sesli mesaj"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> dk. <xliff:g id="SECONDS">%s</xliff:g> sn."</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> sn."</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml
index 03d9fb732..5f3e0aecf 100644
--- a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"на номер <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> на номер <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Голосова пошта"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> хв <xliff:g id="SECONDS">%s</xliff:g> с"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> с"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml
index 914e7ac03..9872d4368 100644
--- a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"بذریعہ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> پر، بذریعہ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"صوتی میل"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>منٹ <xliff:g id="SECONDS">%s</xliff:g>سیکنڈ"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>سیکنڈ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml
index b41f62262..7917f4790 100644
--- a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml
@@ -26,7 +26,7 @@
     <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Kiruvchi videochaqiruv boshqa qurilmaga o‘tkazildi"</string>
     <string name="type_outgoing_video" msgid="309370072333983910">"Chiquvchi videochaqiruv"</string>
     <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Chiquvchi videochaqiruv boshqa qurilmaga o‘tkazildi"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Javobsiz videochaqiruv"</string>
+    <string name="type_missed_video" msgid="4350107016317603785">"Javobsiz video chaqiruv"</string>
     <string name="type_voicemail" msgid="1877524395253846684">"Ovozli pochta"</string>
     <string name="type_rejected" msgid="5632107438472996198">"Rad etilgan chaqiruv"</string>
     <string name="type_blocked" msgid="9177237294052244929">"Bloklangan chaqiruv"</string>
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami orqali"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> raqami orqali"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Ovozli pochta"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> daq. <xliff:g id="SECONDS">%s</xliff:g> son."</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> son."</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml
index c20cd2710..b722dc234 100644
--- a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"qua <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"trên <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, qua <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Thư thoại"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> phút <xliff:g id="SECONDS">%s</xliff:g> giây"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> giây"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml
index 89ae77fa7..6f20642e3 100644
--- a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"通过 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"帐号：<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>，通过 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"语音邮件"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml
index 23a9d6735..83b68acfb 100644
--- a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"透過 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"在 <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> 上透過 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"留言"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml
index a67147047..1566f05d4 100644
--- a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"透過 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>，透過 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"語音留言"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g> 分鐘 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml
index 865cfce37..289ff34fe 100644
--- a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml
@@ -35,8 +35,6 @@
     <string name="description_via_number" msgid="7682575124846343076">"nge-<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"ku-<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, nge-<xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Ivoyisimeyili"</string>
-    <!-- no translation found for call_details_duration_format (296780245582838089) -->
-    <skip />
-    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
-    <skip />
+    <string name="call_details_duration_format" msgid="296780245582838089">"<xliff:g id="MINUTES">%s</xliff:g>m <xliff:g id="SECONDS">%s</xliff:g>s"</string>
+    <string name="call_details_short_duration_format" msgid="8079910850626312453">"<xliff:g id="SECONDS">%s</xliff:g>s"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/drawable/floating_action_button.xml b/java/com/android/dialer/calllogutils/res/values/attrs.xml
index 0b9af5229..9c55e4c30 100644
--- a/java/com/android/dialer/app/res/drawable/floating_action_button.xml
+++ b/java/com/android/dialer/calllogutils/res/values/attrs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2014 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,12 +14,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="@color/floating_action_button_touch_tint">
-  <item android:id="@android:id/mask">
-    <shape android:shape="oval">
-      <solid android:color="@android:color/white"/>
-    </shape>
-  </item>
-</ripple>
-\ No newline at end of file
+<resources>
+  <declare-styleable name="CallTypeIconsView">
+    <!-- This attribute is used to let CallTypeIconsView know that we want to use large
+    icons (Call Details) instead of small icons (Call Log). Using large icons also limits
+    CallTypeIconsView to only use one icon at a time. -->
+    <attr name="useLargeIcons" format="boolean" />
+  </declare-styleable>
+</resources>
+\ No newline at end of file
diff --git a/java/com/android/dialer/database/CallLogQueryHandler.java b/java/com/android/dialer/database/CallLogQueryHandler.java
index 1f6bd5fb3..35f7854ac 100644
--- a/java/com/android/dialer/database/CallLogQueryHandler.java
+++ b/java/com/android/dialer/database/CallLogQueryHandler.java
@@ -33,7 +33,6 @@ import android.os.Message;
 import android.provider.CallLog.Calls;
 import android.provider.VoicemailContract.Status;
 import android.provider.VoicemailContract.Voicemails;
-import android.support.v4.os.BuildCompat;
 import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.AppCompatConstants;
@@ -113,14 +112,21 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
   }
 
   public void fetchVoicemailStatus() {
+    StringBuilder where = new StringBuilder();
+    List<String> selectionArgs = new ArrayList<>();
+
+    VoicemailComponent.get(mContext)
+        .getVoicemailClient()
+        .appendOmtpVoicemailStatusSelectionClause(mContext, where, selectionArgs);
+
     if (TelecomUtil.hasReadWriteVoicemailPermissions(mContext)) {
       startQuery(
           QUERY_VOICEMAIL_STATUS_TOKEN,
           null,
           Status.CONTENT_URI,
           VoicemailStatusQuery.getProjection(),
-          null,
-          null,
+          where.toString(),
+          selectionArgs.toArray(new String[selectionArgs.size()]),
           null);
     }
   }
@@ -132,11 +138,9 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
           new StringBuilder(Voicemails.IS_READ + "=0" + " AND " + Voicemails.DELETED + "=0 ");
       List<String> selectionArgs = new ArrayList<>();
 
-      if (BuildCompat.isAtLeastO()) {
-        VoicemailComponent.get(mContext)
-            .getVoicemailClient()
-            .appendOmtpVoicemailSelectionClause(mContext, where, selectionArgs);
-      }
+      VoicemailComponent.get(mContext)
+          .getVoicemailClient()
+          .appendOmtpVoicemailSelectionClause(mContext, where, selectionArgs);
 
       startQuery(
           QUERY_VOICEMAIL_UNREAD_COUNT_TOKEN,
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/dialer_fab.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/dialer_fab.png
deleted file mode 100644
index 3380a899d..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/dialer_fab.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_green.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_green.png
deleted file mode 100644
index ff9753c18..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_green.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_ic_call.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_ic_call.png
deleted file mode 100644
index 7bf83fa6a..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_ic_call.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/dialer_fab.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/dialer_fab.png
deleted file mode 100644
index 46630d430..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-mdpi/dialer_fab.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_green.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_green.png
deleted file mode 100644
index 947aac142..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_green.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_ic_call.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_ic_call.png
deleted file mode 100644
index 790f93590..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_ic_call.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/dialer_fab.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/dialer_fab.png
deleted file mode 100644
index 5dafee092..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/dialer_fab.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_green.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_green.png
deleted file mode 100644
index e8bab3fec..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_green.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_ic_call.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_ic_call.png
deleted file mode 100644
index 6bd53f5c5..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_ic_call.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/dialer_fab.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/dialer_fab.png
deleted file mode 100644
index 2b0dba7bc..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/dialer_fab.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_green.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_green.png
deleted file mode 100644
index 7e4fd3e49..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_green.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_ic_call.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_ic_call.png
deleted file mode 100644
index 6866fa430..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_ic_call.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/dialer_fab.png b/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/dialer_fab.png
deleted file mode 100644
index 59d9b9506..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/dialer_fab.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_green.png b/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_green.png
deleted file mode 100644
index aa8849e86..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_green.png
+++ /dev/null
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_ic_call.png b/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_ic_call.png
deleted file mode 100644
index 7af3396b4..000000000
--- a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_ic_call.png
+++ /dev/null
diff --git a/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java b/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java
index 5291e292f..c773a2dfa 100644
--- a/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java
+++ b/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java
@@ -18,27 +18,19 @@ package com.android.dialer.enrichedcall;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import com.android.dialer.inject.HasRootComponent;
 import dagger.Subcomponent;
-import com.android.dialer.enrichedcall.stub.EnrichedCallManagerStub;
 
 /** Subcomponent that can be used to access the enriched call implementation. */
-public class EnrichedCallComponent {
-  private static EnrichedCallComponent instance;
-  private EnrichedCallManager enrichedCallManager;
+@Subcomponent
+public abstract class EnrichedCallComponent {
 
   @NonNull
-  public EnrichedCallManager getEnrichedCallManager() {
-    if (enrichedCallManager == null) {
-        enrichedCallManager = new EnrichedCallManagerStub();
-    }
-    return enrichedCallManager;
-  }
+  public abstract EnrichedCallManager getEnrichedCallManager();
 
   public static EnrichedCallComponent get(Context context) {
-    if (instance == null) {
-        instance = new EnrichedCallComponent();
-    }
-    return instance;
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .enrichedCallComponent();
   }
 
   /** Used to refer to the root application component. */
diff --git a/java/com/android/dialer/postcall/PostCall.java b/java/com/android/dialer/postcall/PostCall.java
index cfe7c867b..bd7f9c35f 100644
--- a/java/com/android/dialer/postcall/PostCall.java
+++ b/java/com/android/dialer/postcall/PostCall.java
@@ -151,7 +151,7 @@ public class PostCall {
     return disconnectTimeMillis != -1
         && connectTimeMillis != -1
         && binding.getLong("postcall_last_call_threshold", 30_000) > timeSinceDisconnect
-        && binding.getLong("postcall_call_duration_threshold", 60_000) > callDurationMillis;
+        && binding.getLong("postcall_call_duration_threshold", 35_000) > callDurationMillis;
   }
 
   private static boolean shouldPromptUserToViewSentMessage(Context context) {
diff --git a/java/com/android/dialer/simulator/SimulatorComponent.java b/java/com/android/dialer/simulator/SimulatorComponent.java
index a16592e34..f14496b80 100644
--- a/java/com/android/dialer/simulator/SimulatorComponent.java
+++ b/java/com/android/dialer/simulator/SimulatorComponent.java
@@ -17,26 +17,18 @@
 package com.android.dialer.simulator;
 
 import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
 import dagger.Subcomponent;
-import com.android.dialer.simulator.impl.SimulatorImpl;
 
 /** Subcomponent that can be used to access the simulator implementation. */
-public class SimulatorComponent {
-  private static SimulatorComponent instance;
-  private Simulator simulator;
+@Subcomponent
+public abstract class SimulatorComponent {
 
-  public Simulator getSimulator() {
-    if (simulator == null) {
-        simulator = new SimulatorImpl();
-    }
-    return simulator;
-  }
+  public abstract Simulator getSimulator();
 
   public static SimulatorComponent get(Context context) {
-    if (instance == null) {
-        instance = new SimulatorComponent();
-    }
-    return instance;
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .simulatorComponent();
   }
 
   /** Used to refer to the root application component. */
diff --git a/java/com/android/dialer/simulator/impl/SimulatorImpl.java b/java/com/android/dialer/simulator/impl/SimulatorImpl.java
index 9c6826940..2dd180ef4 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorImpl.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorImpl.java
@@ -24,7 +24,7 @@ import com.android.dialer.simulator.Simulator;
 import javax.inject.Inject;
 
 /** The entry point for the simulator feature. */
-final public class SimulatorImpl implements Simulator {
+final class SimulatorImpl implements Simulator {
   @Inject
   public SimulatorImpl() {}
 
diff --git a/java/com/android/dialer/theme/res/values/colors.xml b/java/com/android/dialer/theme/res/values/colors.xml
index bf43e01af..755c3dbe2 100644
--- a/java/com/android/dialer/theme/res/values/colors.xml
+++ b/java/com/android/dialer/theme/res/values/colors.xml
@@ -32,7 +32,9 @@
   <color name="dialer_snackbar_action_text_color">#4285F4</color>
   <color name="dialer_theme_color_20pct">#332A56C6</color>
 
-  <color name="dialer_secondary_color">#e91e63</color>
+  <color name="dialpad_fab_green">#00C853</color>
+
+  <color name="dialer_secondary_color">#F50057</color>
 
   <!-- Primary text color in the Phone app -->
   <color name="dialer_primary_text_color">#333333</color>
diff --git a/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java b/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java
index 142bb63ed..a1fc29edf 100644
--- a/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java
+++ b/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java
@@ -53,7 +53,7 @@ public class VisualVoicemailEnabledChecker implements CallLogQueryHandler.Listen
     mContext = context;
     mCallback = callback;
     mPrefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-    mVoicemailStatusHelper = new VoicemailStatusHelperImpl();
+    mVoicemailStatusHelper = new VoicemailStatusHelper();
     mHasActiveVoicemailProvider = mPrefs.getBoolean(PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER, false);
   }
 
@@ -80,7 +80,10 @@ public class VisualVoicemailEnabledChecker implements CallLogQueryHandler.Listen
         mVoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) > 0;
     if (hasActiveVoicemailProvider != mHasActiveVoicemailProvider) {
       mHasActiveVoicemailProvider = hasActiveVoicemailProvider;
-      mPrefs.edit().putBoolean(PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER, mHasActiveVoicemailProvider);
+      mPrefs
+          .edit()
+          .putBoolean(PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER, mHasActiveVoicemailProvider)
+          .apply();
       if (mCallback != null) {
         mCallback.onVisualVoicemailEnabledStatusChanged(mHasActiveVoicemailProvider);
       }
diff --git a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java b/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java
index 16bfe704d..9df45c211 100644
--- a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java
+++ b/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java
@@ -17,10 +17,8 @@
 package com.android.dialer.voicemailstatus;
 
 import android.database.Cursor;
-import android.net.Uri;
 import android.provider.VoicemailContract.Status;
-import android.support.annotation.VisibleForTesting;
-import java.util.List;
+import com.android.dialer.database.VoicemailStatusQuery;
 
 /**
  * Interface used by the call log UI to determine what user message, if any, related to voicemail
@@ -31,66 +29,40 @@ import java.util.List;
  * shown. The user of this interface must observe/listen to provider changes and invoke this class
  * to check if any message needs to be shown.
  */
-public interface VoicemailStatusHelper {
-
-  /**
-   * Returns a list of messages, in the order or priority that should be shown to the user. An empty
-   * list is returned if no message needs to be shown.
-   *
-   * @param cursor The cursor pointing to the query on {@link Status#CONTENT_URI}. The projection to
-   *     be used is defined by the implementation class of this interface.
-   */
-  @VisibleForTesting
-  List<StatusMessage> getStatusMessages(Cursor cursor);
+public class VoicemailStatusHelper {
 
   /**
    * Returns the number of active voicemail sources installed.
    *
    * <p>The number of sources is counted by querying the voicemail status table.
+   *
+   * @param cursor The caller is responsible for the life cycle of the cursor and resetting the
+   *     position
    */
-  int getNumberActivityVoicemailSources(Cursor cursor);
-
-  @VisibleForTesting
-  class StatusMessage {
-
-    /** Package of the source on behalf of which this message has to be shown. */
-    public final String sourcePackage;
-    /**
-     * The string resource id of the status message that should be shown in the call log page. Set
-     * to -1, if this message is not to be shown in call log.
-     */
-    public final int callLogMessageId;
-    /**
-     * The string resource id of the status message that should be shown in the call details page.
-     * Set to -1, if this message is not to be shown in call details page.
-     */
-    public final int callDetailsMessageId;
-    /** The string resource id of the action message that should be shown. */
-    public final int actionMessageId;
-    /** URI for the corrective action, where applicable. Null if no action URI is available. */
-    public final Uri actionUri;
-
-    public StatusMessage(
-        String sourcePackage,
-        int callLogMessageId,
-        int callDetailsMessageId,
-        int actionMessageId,
-        Uri actionUri) {
-      this.sourcePackage = sourcePackage;
-      this.callLogMessageId = callLogMessageId;
-      this.callDetailsMessageId = callDetailsMessageId;
-      this.actionMessageId = actionMessageId;
-      this.actionUri = actionUri;
-    }
-
-    /** Whether this message should be shown in the call log page. */
-    public boolean showInCallLog() {
-      return callLogMessageId != -1;
+  public int getNumberActivityVoicemailSources(Cursor cursor) {
+    int count = 0;
+    if (!cursor.moveToFirst()) {
+      return 0;
     }
+    do {
+      if (isVoicemailSourceActive(cursor)) {
+        ++count;
+      }
+    } while (cursor.moveToNext());
+    return count;
+  }
 
-    /** Whether this message should be shown in the call details page. */
-    public boolean showInCallDetails() {
-      return callDetailsMessageId != -1;
-    }
+  /**
+   * Returns whether the source status in the cursor corresponds to an active source. A source is
+   * active if its' configuration state is not NOT_CONFIGURED. For most voicemail sources, only OK
+   * and NOT_CONFIGURED are used. The OMTP visual voicemail client has the same behavior pre-NMR1.
+   * NMR1 visual voicemail will only set it to NOT_CONFIGURED when it is deactivated. As soon as
+   * activation is attempted, it will transition into CONFIGURING then into OK or other error state,
+   * NOT_CONFIGURED is never set through an error.
+   */
+  private boolean isVoicemailSourceActive(Cursor cursor) {
+    return cursor.getString(VoicemailStatusQuery.SOURCE_PACKAGE_INDEX) != null
+        && cursor.getInt(VoicemailStatusQuery.CONFIGURATION_STATE_INDEX)
+            != Status.CONFIGURATION_STATE_NOT_CONFIGURED;
   }
 }
diff --git a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelperImpl.java b/java/com/android/dialer/voicemailstatus/VoicemailStatusHelperImpl.java
deleted file mode 100644
index 404897fde..000000000
--- a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelperImpl.java
+++ /dev/null
@@ -1,278 +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.voicemailstatus;
-
-import static android.provider.VoicemailContract.Status.CONFIGURATION_STATE_CAN_BE_CONFIGURED;
-import static android.provider.VoicemailContract.Status.CONFIGURATION_STATE_OK;
-import static android.provider.VoicemailContract.Status.DATA_CHANNEL_STATE_NO_CONNECTION;
-import static android.provider.VoicemailContract.Status.DATA_CHANNEL_STATE_OK;
-import static android.provider.VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING;
-import static android.provider.VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION;
-import static android.provider.VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_OK;
-
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.VoicemailContract.Status;
-import com.android.contacts.common.util.UriUtils;
-import com.android.dialer.database.VoicemailStatusQuery;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/** Implementation of {@link VoicemailStatusHelper}. */
-public class VoicemailStatusHelperImpl implements VoicemailStatusHelper {
-
-  @Override
-  public List<StatusMessage> getStatusMessages(Cursor cursor) {
-    List<MessageStatusWithPriority> messages =
-        new ArrayList<VoicemailStatusHelperImpl.MessageStatusWithPriority>();
-    cursor.moveToPosition(-1);
-    while (cursor.moveToNext()) {
-      MessageStatusWithPriority message = getMessageForStatusEntry(cursor);
-      if (message != null) {
-        messages.add(message);
-      }
-    }
-    // Finally reorder the messages by their priority.
-    return reorderMessages(messages);
-  }
-
-  @Override
-  public int getNumberActivityVoicemailSources(Cursor cursor) {
-    int count = 0;
-    cursor.moveToPosition(-1);
-    while (cursor.moveToNext()) {
-      if (isVoicemailSourceActive(cursor)) {
-        ++count;
-      }
-    }
-    return count;
-  }
-
-  /**
-   * Returns whether the source status in the cursor corresponds to an active source. A source is
-   * active if its' configuration state is not NOT_CONFIGURED. For most voicemail sources, only OK
-   * and NOT_CONFIGURED are used. The OMTP visual voicemail client has the same behavior pre-NMR1.
-   * NMR1 visual voicemail will only set it to NOT_CONFIGURED when it is deactivated. As soon as
-   * activation is attempted, it will transition into CONFIGURING then into OK or other error state,
-   * NOT_CONFIGURED is never set through an error.
-   */
-  private boolean isVoicemailSourceActive(Cursor cursor) {
-    return cursor.getString(VoicemailStatusQuery.SOURCE_PACKAGE_INDEX) != null
-        && cursor.getInt(VoicemailStatusQuery.CONFIGURATION_STATE_INDEX)
-            != Status.CONFIGURATION_STATE_NOT_CONFIGURED;
-  }
-
-  private List<StatusMessage> reorderMessages(List<MessageStatusWithPriority> messageWrappers) {
-    Collections.sort(
-        messageWrappers,
-        new Comparator<MessageStatusWithPriority>() {
-          @Override
-          public int compare(MessageStatusWithPriority msg1, MessageStatusWithPriority msg2) {
-            return msg1.mPriority - msg2.mPriority;
-          }
-        });
-    List<StatusMessage> reorderMessages = new ArrayList<VoicemailStatusHelper.StatusMessage>();
-    // Copy the ordered message objects into the final list.
-    for (MessageStatusWithPriority messageWrapper : messageWrappers) {
-      reorderMessages.add(messageWrapper.mMessage);
-    }
-    return reorderMessages;
-  }
-
-  /** Returns the message for the status entry pointed to by the cursor. */
-  private MessageStatusWithPriority getMessageForStatusEntry(Cursor cursor) {
-    final String sourcePackage = cursor.getString(VoicemailStatusQuery.SOURCE_PACKAGE_INDEX);
-    if (sourcePackage == null) {
-      return null;
-    }
-    final OverallState overallState =
-        getOverallState(
-            cursor.getInt(VoicemailStatusQuery.CONFIGURATION_STATE_INDEX),
-            cursor.getInt(VoicemailStatusQuery.DATA_CHANNEL_STATE_INDEX),
-            cursor.getInt(VoicemailStatusQuery.NOTIFICATION_CHANNEL_STATE_INDEX));
-    final Action action = overallState.getAction();
-
-    // No source package or no action, means no message shown.
-    if (action == Action.NONE) {
-      return null;
-    }
-
-    Uri actionUri = null;
-    if (action == Action.CALL_VOICEMAIL) {
-      actionUri =
-          UriUtils.parseUriOrNull(
-              cursor.getString(VoicemailStatusQuery.VOICEMAIL_ACCESS_URI_INDEX));
-      // Even if actionUri is null, it is still be useful to show the notification.
-    } else if (action == Action.CONFIGURE_VOICEMAIL) {
-      actionUri =
-          UriUtils.parseUriOrNull(cursor.getString(VoicemailStatusQuery.SETTINGS_URI_INDEX));
-      // If there is no settings URI, there is no point in showing the notification.
-      if (actionUri == null) {
-        return null;
-      }
-    }
-    return new MessageStatusWithPriority(
-        new StatusMessage(
-            sourcePackage,
-            overallState.getCallLogMessageId(),
-            overallState.getCallDetailsMessageId(),
-            action.getMessageId(),
-            actionUri),
-        overallState.getPriority());
-  }
-
-  private OverallState getOverallState(
-      int configurationState, int dataChannelState, int notificationChannelState) {
-    if (configurationState == CONFIGURATION_STATE_OK) {
-      // Voicemail is configured. Let's see how is the data channel.
-      if (dataChannelState == DATA_CHANNEL_STATE_OK) {
-        // Data channel is fine. What about notification channel?
-        if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_OK) {
-          return OverallState.OK;
-        } else if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING) {
-          return OverallState.NO_DETAILED_NOTIFICATION;
-        } else if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_NO_CONNECTION) {
-          return OverallState.NO_NOTIFICATIONS;
-        }
-      } else if (dataChannelState == DATA_CHANNEL_STATE_NO_CONNECTION) {
-        // Data channel is not working. What about notification channel?
-        if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_OK) {
-          return OverallState.NO_DATA;
-        } else if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING) {
-          return OverallState.MESSAGE_WAITING;
-        } else if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_NO_CONNECTION) {
-          return OverallState.NO_CONNECTION;
-        }
-      }
-    } else if (configurationState == CONFIGURATION_STATE_CAN_BE_CONFIGURED) {
-      // Voicemail not configured. data/notification channel states are irrelevant.
-      return OverallState.INVITE_FOR_CONFIGURATION;
-    } else if (configurationState == Status.CONFIGURATION_STATE_NOT_CONFIGURED) {
-      // Voicemail not configured. data/notification channel states are irrelevant.
-      return OverallState.NOT_CONFIGURED;
-    }
-    // Will reach here only if the source has set an invalid value.
-    return OverallState.INVALID;
-  }
-
-  /** Possible user actions. */
-  public enum Action {
-    NONE(-1),
-    CALL_VOICEMAIL(R.string.voicemail_status_action_call_server),
-    CONFIGURE_VOICEMAIL(R.string.voicemail_status_action_configure);
-
-    private final int mMessageId;
-
-    Action(int messageId) {
-      mMessageId = messageId;
-    }
-
-    public int getMessageId() {
-      return mMessageId;
-    }
-  }
-
-  /**
-   * Overall state of the source status. Each state is associated with the corresponding display
-   * string and the corrective action. The states are also assigned a relative priority which is
-   * used to order the messages from different sources.
-   */
-  private enum OverallState {
-    // TODO: Add separate string for call details and call log pages for the states that needs
-    // to be shown in both.
-    /** Both notification and data channel are not working. */
-    NO_CONNECTION(
-        0,
-        Action.CALL_VOICEMAIL,
-        R.string.voicemail_status_voicemail_not_available,
-        R.string.voicemail_status_audio_not_available),
-    /** Notifications working, but data channel is not working. Audio cannot be downloaded. */
-    NO_DATA(
-        1,
-        Action.CALL_VOICEMAIL,
-        R.string.voicemail_status_voicemail_not_available,
-        R.string.voicemail_status_audio_not_available),
-    /** Messages are known to be waiting but data channel is not working. */
-    MESSAGE_WAITING(
-        2,
-        Action.CALL_VOICEMAIL,
-        R.string.voicemail_status_messages_waiting,
-        R.string.voicemail_status_audio_not_available),
-    /** Notification channel not working, but data channel is. */
-    NO_NOTIFICATIONS(3, Action.CALL_VOICEMAIL, R.string.voicemail_status_voicemail_not_available),
-    /** Invite user to set up voicemail. */
-    INVITE_FOR_CONFIGURATION(
-        4, Action.CONFIGURE_VOICEMAIL, R.string.voicemail_status_configure_voicemail),
-    /**
-     * No detailed notifications, but data channel is working. This is normal mode of operation for
-     * certain sources. No action needed.
-     */
-    NO_DETAILED_NOTIFICATION(5, Action.NONE, -1),
-    /** Visual voicemail not yet set up. No local action needed. */
-    NOT_CONFIGURED(6, Action.NONE, -1),
-    /** Everything is OK. */
-    OK(7, Action.NONE, -1),
-    /** If one or more state value set by the source is not valid. */
-    INVALID(8, Action.NONE, -1);
-
-    private final int mPriority;
-    private final Action mAction;
-    private final int mCallLogMessageId;
-    private final int mCallDetailsMessageId;
-
-    OverallState(int priority, Action action, int callLogMessageId) {
-      this(priority, action, callLogMessageId, -1);
-    }
-
-    OverallState(int priority, Action action, int callLogMessageId, int callDetailsMessageId) {
-      mPriority = priority;
-      mAction = action;
-      mCallLogMessageId = callLogMessageId;
-      mCallDetailsMessageId = callDetailsMessageId;
-    }
-
-    public Action getAction() {
-      return mAction;
-    }
-
-    public int getPriority() {
-      return mPriority;
-    }
-
-    public int getCallLogMessageId() {
-      return mCallLogMessageId;
-    }
-
-    public int getCallDetailsMessageId() {
-      return mCallDetailsMessageId;
-    }
-  }
-
-  /** A wrapper on {@link StatusMessage} which additionally stores the priority of the message. */
-  private static class MessageStatusWithPriority {
-
-    private final StatusMessage mMessage;
-    private final int mPriority;
-
-    public MessageStatusWithPriority(StatusMessage message, int priority) {
-      mMessage = message;
-      mPriority = priority;
-    }
-  }
-}
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 7c4394872..395829b80 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -625,7 +625,11 @@ public class InCallActivity extends TransactionSafeFragmentActivity
 
     // Show a new answer screen.
     AnswerScreen answerScreen =
-        AnswerBindings.createAnswerScreen(call.getId(), call.isVideoCall(), isVideoUpgradeRequest);
+        AnswerBindings.createAnswerScreen(
+            call.getId(),
+            call.isVideoCall(),
+            isVideoUpgradeRequest,
+            call.getVideoTech().isSelfManagedCamera());
     transaction.add(R.id.main, answerScreen.getAnswerScreenFragment(), TAG_ANSWER_SCREEN);
 
     Logger.get(this).logScreenView(ScreenEvent.Type.INCOMING_CALL, this);
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index 0f3982ce4..63dab792f 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -757,8 +757,10 @@ public class InCallPresenter implements CallList.Listener {
       FilteredNumbersUtil.recordLastEmergencyCallTime(mContext);
     }
 
-    if (!call.getLogState().isIncoming && !mCallList.hasLiveCall()) {
-      PostCall.onCallDisconnected(mContext, call.getNumber(), call.getConnectTimeMillis());
+    if (!mCallList.hasLiveCall()
+        && !call.getLogState().isIncoming
+        && !CallerInfoUtils.isVoiceMailNumber(mContext, call)) {
+      PostCall.onCallDisconnected(mContext, call.getNumber(), call.getTimeAddedMs());
     }
   }
 
diff --git a/java/com/android/incallui/answer/bindings/AnswerBindings.java b/java/com/android/incallui/answer/bindings/AnswerBindings.java
index 442e207a0..8be283990 100644
--- a/java/com/android/incallui/answer/bindings/AnswerBindings.java
+++ b/java/com/android/incallui/answer/bindings/AnswerBindings.java
@@ -23,7 +23,11 @@ import com.android.incallui.answer.protocol.AnswerScreen;
 public class AnswerBindings {
 
   public static AnswerScreen createAnswerScreen(
-      String callId, boolean isVideoCall, boolean isVideoUpgradeRequest) {
-    return AnswerFragment.newInstance(callId, isVideoCall, isVideoUpgradeRequest);
+      String callId,
+      boolean isVideoCall,
+      boolean isVideoUpgradeRequest,
+      boolean isSelfManagedCamera) {
+    return AnswerFragment.newInstance(
+        callId, isVideoCall, isVideoUpgradeRequest, isSelfManagedCamera);
   }
 }
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java
index 6874daea3..c6304c0fa 100644
--- a/java/com/android/incallui/answer/impl/AnswerFragment.java
+++ b/java/com/android/incallui/answer/impl/AnswerFragment.java
@@ -106,6 +106,9 @@ public class AnswerFragment extends Fragment
   @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
   static final String ARG_IS_VIDEO_UPGRADE_REQUEST = "is_video_upgrade_request";
 
+  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+  static final String ARG_IS_SELF_MANAGED_CAMERA = "is_self_managed_camera";
+
   private static final String STATE_HAS_ANIMATED_ENTRY = "hasAnimated";
 
   private static final int HINT_SECONDARY_SHOW_DURATION_MILLIS = 5000;
@@ -288,11 +291,15 @@ public class AnswerFragment extends Fragment
   }
 
   public static AnswerFragment newInstance(
-      String callId, boolean isVideoCall, boolean isVideoUpgradeRequest) {
+      String callId,
+      boolean isVideoCall,
+      boolean isVideoUpgradeRequest,
+      boolean isSelfManagedCamera) {
     Bundle bundle = new Bundle();
     bundle.putString(ARG_CALL_ID, Assert.isNotNull(callId));
     bundle.putBoolean(ARG_IS_VIDEO_CALL, isVideoCall);
     bundle.putBoolean(ARG_IS_VIDEO_UPGRADE_REQUEST, isVideoUpgradeRequest);
+    bundle.putBoolean(ARG_IS_SELF_MANAGED_CAMERA, isSelfManagedCamera);
 
     AnswerFragment instance = new AnswerFragment();
     instance.setArguments(bundle);
@@ -347,10 +354,10 @@ public class AnswerFragment extends Fragment
     secondaryButton.setFocusable(AccessibilityUtil.isAccessibilityEnabled(getContext()));
     secondaryButton.setAccessibilityDelegate(accessibilityDelegate);
 
-    if (isVideoCall()) {
-      secondaryButton.setVisibility(View.VISIBLE);
-    } else {
+    if (isVideoUpgradeRequest()) {
       secondaryButton.setVisibility(View.INVISIBLE);
+    } else if (isVideoCall()) {
+      secondaryButton.setVisibility(View.VISIBLE);
     }
   }
 
@@ -620,7 +627,11 @@ public class AnswerFragment extends Fragment
     view.setSystemUiVisibility(flags);
     if (isVideoCall() || isVideoUpgradeRequest()) {
       if (VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
-        answerVideoCallScreen = new AnswerVideoCallScreen(getCallId(), this, view);
+        if (isSelfManagedCamera()) {
+          answerVideoCallScreen = new SelfManagedAnswerVideoCallScreen(getCallId(), this, view);
+        } else {
+          answerVideoCallScreen = new AnswerVideoCallScreen(getCallId(), this, view);
+        }
       } else {
         view.findViewById(R.id.videocall_video_off).setVisibility(View.VISIBLE);
       }
@@ -718,6 +729,10 @@ public class AnswerFragment extends Fragment
     return getArguments().getBoolean(ARG_IS_VIDEO_CALL);
   }
 
+  public boolean isSelfManagedCamera() {
+    return getArguments().getBoolean(ARG_IS_SELF_MANAGED_CAMERA);
+  }
+
   @Override
   public void onAnswerProgressUpdate(@FloatRange(from = -1f, to = 1f) float answerProgress) {
     // Don't fade the window background for call waiting or video upgrades. Fading the background
diff --git a/java/com/android/incallui/answer/impl/FixedAspectSurfaceView.java b/java/com/android/incallui/answer/impl/FixedAspectSurfaceView.java
new file mode 100644
index 000000000..ad7d94d95
--- /dev/null
+++ b/java/com/android/incallui/answer/impl/FixedAspectSurfaceView.java
@@ -0,0 +1,86 @@
+/*
+ * 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.incallui.answer.impl;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.SurfaceView;
+import android.view.View;
+import com.android.dialer.common.Assert;
+
+/**
+ * A SurfaceView that maintains its aspect ratio to be a desired target value.
+ *
+ * <p>The FixedAspectSurfaceView will not be able to maintain the requested aspect ratio if both the
+ * width and the height are exactly determined by the layout. To avoid this, ensure that either the
+ * height or the width is adjustable by the view; for example, by setting the layout parameters to
+ * be WRAP_CONTENT for the dimension that is best adjusted to maintain the aspect ratio.
+ */
+public class FixedAspectSurfaceView extends SurfaceView {
+
+  /** Desired width/height ratio */
+  private float mAspectRatio;
+
+  private final boolean scaleWidth;
+  private final boolean scaleHeight;
+
+  public FixedAspectSurfaceView(Context context, AttributeSet attrs) {
+    super(context, attrs);
+
+    // Get initial aspect ratio from custom attributes
+    TypedArray a =
+        context.getTheme().obtainStyledAttributes(attrs, R.styleable.FixedAspectSurfaceView, 0, 0);
+    scaleHeight = a.getBoolean(R.styleable.FixedAspectSurfaceView_scaleHeight, false);
+    scaleWidth = a.getBoolean(R.styleable.FixedAspectSurfaceView_scaleWidth, false);
+    Assert.checkArgument(scaleHeight != scaleWidth, "Must either scale width or height");
+    setAspectRatio(a.getFloat(R.styleable.FixedAspectSurfaceView_aspectRatio, 1.f));
+    a.recycle();
+  }
+
+  /**
+   * Set the desired aspect ratio for this view.
+   *
+   * @param aspect the desired width/height ratio in the current UI orientation. Must be a positive
+   *     value.
+   */
+  public void setAspectRatio(float aspect) {
+    Assert.checkArgument(aspect >= 0, "Aspect ratio must be positive");
+    mAspectRatio = aspect;
+    requestLayout();
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    int width = MeasureSpec.getSize(widthMeasureSpec);
+    int height = MeasureSpec.getSize(heightMeasureSpec);
+
+    // Do the scaling
+    if (scaleWidth) {
+      width = (int) (height * mAspectRatio);
+    } else if (scaleHeight) {
+      height = (int) (width / mAspectRatio);
+    }
+
+    // Override width/height if needed for EXACTLY and AT_MOST specs
+    width = View.resolveSizeAndState(width, widthMeasureSpec, 0);
+    height = View.resolveSizeAndState(height, heightMeasureSpec, 0);
+
+    // Finally set the calculated dimensions
+    setMeasuredDimension(width, height);
+  }
+}
diff --git a/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java b/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java
new file mode 100644
index 000000000..522d77235
--- /dev/null
+++ b/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java
@@ -0,0 +1,268 @@
+/*
+ * 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.incallui.answer.impl;
+
+import android.content.Context;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraDevice.StateCallback;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.util.Size;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.incallui.video.protocol.VideoCallScreen;
+import java.util.Arrays;
+
+/**
+ * Shows the local preview for the incoming video call or video upgrade request. This class is used
+ * for RCS Video Share where we need to open the camera preview ourselves. For IMS Video the camera
+ * is managed by the modem, see {@link AnswerVideoCallScreen}.
+ */
+public class SelfManagedAnswerVideoCallScreen extends StateCallback implements VideoCallScreen {
+
+  private static final int MAX_WIDTH = 1920;
+  private static final float ASPECT_TOLERANCE = 0.1f;
+  private static final float TARGET_ASPECT = 16.f / 9.f;
+
+  @NonNull private final String callId;
+  @NonNull private final Fragment fragment;
+  @NonNull private final FixedAspectSurfaceView surfaceView;
+  private final Context context;
+
+  private String cameraId;
+  private CameraDevice camera;
+  private CaptureRequest.Builder captureRequestBuilder;
+
+  public SelfManagedAnswerVideoCallScreen(
+      @NonNull String callId, @NonNull Fragment fragment, @NonNull View view) {
+    this.callId = Assert.isNotNull(callId);
+    this.fragment = Assert.isNotNull(fragment);
+    this.context = Assert.isNotNull(fragment.getContext());
+
+    surfaceView =
+        Assert.isNotNull(
+            (FixedAspectSurfaceView) view.findViewById(R.id.incoming_preview_surface_view));
+    surfaceView.setVisibility(View.VISIBLE);
+    view.findViewById(R.id.incoming_preview_texture_view_overlay).setVisibility(View.VISIBLE);
+    view.setBackgroundColor(0xff000000);
+  }
+
+  @Override
+  public void onVideoScreenStart() {
+    openCamera();
+  }
+
+  @Override
+  public void onVideoScreenStop() {
+    closeCamera();
+  }
+
+  @Override
+  public void showVideoViews(
+      boolean shouldShowPreview, boolean shouldShowRemote, boolean isRemotelyHeld) {}
+
+  @Override
+  public void onLocalVideoDimensionsChanged() {}
+
+  @Override
+  public void onLocalVideoOrientationChanged() {}
+
+  @Override
+  public void onRemoteVideoDimensionsChanged() {}
+
+  @Override
+  public void updateFullscreenAndGreenScreenMode(
+      boolean shouldShowFullscreen, boolean shouldShowGreenScreen) {}
+
+  @Override
+  public Fragment getVideoCallScreenFragment() {
+    return fragment;
+  }
+
+  @Override
+  public String getCallId() {
+    return callId;
+  }
+
+  /**
+   * Opens the first front facing camera on the device into a {@link SurfaceView} while preserving
+   * aspect ratio.
+   */
+  private void openCamera() {
+    CameraManager manager = context.getSystemService(CameraManager.class);
+
+    StreamConfigurationMap configMap = getFrontFacingCameraSizes(manager);
+    if (configMap == null) {
+      return;
+    }
+
+    Size previewSize = getOptimalSize(configMap.getOutputSizes(SurfaceHolder.class));
+    LogUtil.i("SelfManagedAnswerVideoCallScreen.openCamera", "Optimal size: " + previewSize);
+    float outputAspect = (float) previewSize.getWidth() / previewSize.getHeight();
+    surfaceView.setAspectRatio(outputAspect);
+    surfaceView.getHolder().setFixedSize(previewSize.getWidth(), previewSize.getHeight());
+
+    try {
+      manager.openCamera(cameraId, this, null);
+    } catch (CameraAccessException e) {
+      LogUtil.e("SelfManagedAnswerVideoCallScreen.openCamera", "failed to open camera", e);
+    }
+  }
+
+  @Nullable
+  private StreamConfigurationMap getFrontFacingCameraSizes(CameraManager manager) {
+    String[] cameraIds;
+    try {
+      cameraIds = manager.getCameraIdList();
+    } catch (CameraAccessException e) {
+      LogUtil.e(
+          "SelfManagedAnswerVideoCallScreen.getFrontFacingCameraSizes",
+          "failed to get camera ids",
+          e);
+      return null;
+    }
+
+    for (String cameraId : cameraIds) {
+      CameraCharacteristics characteristics;
+      try {
+        characteristics = manager.getCameraCharacteristics(cameraId);
+      } catch (CameraAccessException e) {
+        LogUtil.e(
+            "SelfManagedAnswerVideoCallScreen.getFrontFacingCameraSizes",
+            "failed to get camera characteristics",
+            e);
+        continue;
+      }
+
+      if (characteristics.get(CameraCharacteristics.LENS_FACING)
+          != CameraCharacteristics.LENS_FACING_FRONT) {
+        continue;
+      }
+
+      StreamConfigurationMap configMap =
+          characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+      if (configMap == null) {
+        continue;
+      }
+
+      this.cameraId = cameraId;
+      return configMap;
+    }
+    LogUtil.e(
+        "SelfManagedAnswerVideoCallScreen.getFrontFacingCameraSizes", "No valid configurations.");
+    return null;
+  }
+
+  /**
+   * Given an array of {@link Size}s, tries to find the largest Size such that the aspect ratio of
+   * the returned size is within {@code ASPECT_TOLERANCE} of {@code TARGET_ASPECT}. This is useful
+   * because it provides us with an adequate size/camera resolution that will experience the least
+   * stretching from our fullscreen UI that doesn't match any of the camera sizes.
+   */
+  private static Size getOptimalSize(Size[] outputSizes) {
+    Size bestCandidateSize = outputSizes[0];
+    float bestCandidateAspect =
+        (float) bestCandidateSize.getWidth() / bestCandidateSize.getHeight();
+
+    for (Size candidateSize : outputSizes) {
+      if (candidateSize.getWidth() < MAX_WIDTH) {
+        float candidateAspect = (float) candidateSize.getWidth() / candidateSize.getHeight();
+        boolean isGoodCandidateAspect =
+            Math.abs(candidateAspect - TARGET_ASPECT) < ASPECT_TOLERANCE;
+        boolean isGoodOutputAspect =
+            Math.abs(bestCandidateAspect - TARGET_ASPECT) < ASPECT_TOLERANCE;
+
+        if ((isGoodCandidateAspect && !isGoodOutputAspect)
+            || candidateSize.getWidth() > bestCandidateSize.getWidth()) {
+          bestCandidateSize = candidateSize;
+          bestCandidateAspect = candidateAspect;
+        }
+      }
+    }
+    return bestCandidateSize;
+  }
+
+  @Override
+  public void onOpened(CameraDevice camera) {
+    LogUtil.i("SelfManagedAnswerVideoCallScreen.opOpened", "camera opened.");
+    this.camera = camera;
+    Surface surface = surfaceView.getHolder().getSurface();
+    try {
+      captureRequestBuilder = camera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+      captureRequestBuilder.addTarget(surface);
+      camera.createCaptureSession(Arrays.asList(surface), new CaptureSessionCallback(), null);
+    } catch (CameraAccessException e) {
+      LogUtil.e(
+          "SelfManagedAnswerVideoCallScreen.createCameraPreview", "failed to create preview", e);
+    }
+  }
+
+  @Override
+  public void onDisconnected(CameraDevice camera) {
+    closeCamera();
+  }
+
+  @Override
+  public void onError(CameraDevice camera, int error) {
+    closeCamera();
+  }
+
+  private void closeCamera() {
+    if (camera != null) {
+      camera.close();
+      camera = null;
+    }
+  }
+
+  private class CaptureSessionCallback extends CameraCaptureSession.StateCallback {
+
+    @Override
+    public void onConfigured(@NonNull CameraCaptureSession cameraCaptureSession) {
+      LogUtil.i(
+          "SelfManagedAnswerVideoCallScreen.onConfigured", "camera capture session configured.");
+      // The camera is already closed.
+      if (camera == null) {
+        return;
+      }
+
+      // When the session is ready, we start displaying the preview.
+      captureRequestBuilder.set(CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO);
+      try {
+        cameraCaptureSession.setRepeatingRequest(captureRequestBuilder.build(), null, null);
+      } catch (CameraAccessException e) {
+        LogUtil.e("CaptureSessionCallback.onConfigured", "failed to configure", e);
+      }
+    }
+
+    @Override
+    public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession) {
+      LogUtil.e("CaptureSessionCallback.onConfigureFailed", "failed to configure");
+    }
+  }
+}
diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
index aa153dd4b..042e7b82f 100644
--- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
+++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
@@ -14,7 +14,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-
 <com.android.incallui.answer.impl.AffordanceHolderLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -27,11 +26,20 @@
   android:keepScreenOn="true">
 
   <TextureView
-    android:id="@+id/incoming_preview_texture_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:importantForAccessibility="no"
-    android:visibility="gone"/>
+      android:id="@+id/incoming_preview_texture_view"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:importantForAccessibility="no"
+      android:visibility="gone"/>
+
+  <com.android.incallui.answer.impl.FixedAspectSurfaceView
+      android:id="@+id/incoming_preview_surface_view"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:importantForAccessibility="no"
+      android:visibility="gone"
+      app:scaleWidth="@bool/scale_width"
+      app:scaleHeight="@bool/scale_height"/>
 
   <View
     android:id="@+id/incoming_preview_texture_view_overlay"
diff --git a/java/com/android/incallui/answer/impl/res/values-land/dimens.xml b/java/com/android/incallui/answer/impl/res/values-land/dimens.xml
new file mode 100644
index 000000000..5e2a88ae9
--- /dev/null
+++ b/java/com/android/incallui/answer/impl/res/values-land/dimens.xml
@@ -0,0 +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
+  -->
+<resources>
+  <bool name="scale_width">false</bool>
+  <bool name="scale_height">true</bool>
+</resources>
diff --git a/java/com/android/dialer/app/res/drawable/ic_call_detail_report.xml b/java/com/android/incallui/answer/impl/res/values/attrs.xml
index e90e83e8b..1086e1ca5 100644
--- a/java/com/android/dialer/app/res/drawable/ic_call_detail_report.xml
+++ b/java/com/android/incallui/answer/impl/res/values/attrs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2015 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,7 +14,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<resources>
+  <declare-styleable name="FixedAspectSurfaceView">
+    <attr name="aspectRatio" format="float" />
+    <attr name="scaleWidth" format="boolean"/>
+    <attr name="scaleHeight" format="boolean"/>
+  </declare-styleable>
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_report_24dp"
-  android:tint="@color/call_detail_footer_icon_tint"/>
+  <item name="match_parent" type="dimen">-1</item>
+  <item name="wrap_content" type="dimen">-2</item>
+</resources>
+\ No newline at end of file
diff --git a/java/com/android/incallui/answer/impl/res/values/dimens.xml b/java/com/android/incallui/answer/impl/res/values/dimens.xml
index 8329707a6..50aec0328 100644
--- a/java/com/android/incallui/answer/impl/res/values/dimens.xml
+++ b/java/com/android/incallui/answer/impl/res/values/dimens.xml
@@ -14,7 +14,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-
 <resources>
   <dimen name="answer_contact_name_text_size">24sp</dimen>
   <dimen name="answer_contact_name_min_size">24sp</dimen>
@@ -22,5 +21,7 @@
   <dimen name="answer_avatar_size">0dp</dimen>
   <dimen name="answer_importance_margin_bottom">0dp</dimen>
   <bool name="answer_important_call_allowed">false</bool>
+  <bool name="scale_width">true</bool>
+  <bool name="scale_height">false</bool>
   <integer name="answer_animate_entry_millis">1000</integer>
 </resources>
diff --git a/java/com/android/incallui/calllocation/CallLocationComponent.java b/java/com/android/incallui/calllocation/CallLocationComponent.java
index 6b1faf299..46ca669db 100644
--- a/java/com/android/incallui/calllocation/CallLocationComponent.java
+++ b/java/com/android/incallui/calllocation/CallLocationComponent.java
@@ -17,26 +17,18 @@
 package com.android.incallui.calllocation;
 
 import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
 import dagger.Subcomponent;
-import com.android.incallui.calllocation.stub.StubCallLocationModule;
 
 /** Subcomponent that can be used to access the call location implementation. */
-public class CallLocationComponent {
-  private static CallLocationComponent instance;
-  private CallLocation callLocation;
+@Subcomponent
+public abstract class CallLocationComponent {
 
-  public CallLocation getCallLocation(){
-    if (callLocation == null) {
-        callLocation = new StubCallLocationModule.StubCallLocation();
-    }
-    return callLocation;
-  }
+  public abstract CallLocation getCallLocation();
 
   public static CallLocationComponent get(Context context) {
-    if (instance == null) {
-        instance = new CallLocationComponent();
-    }
-    return instance;
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .callLocationComponent();
   }
 
   /** Used to refer to the root application component. */
diff --git a/java/com/android/incallui/calllocation/impl/HttpFetcher.java b/java/com/android/incallui/calllocation/impl/HttpFetcher.java
index c4aaa2257..7bfbaa6ef 100644
--- a/java/com/android/incallui/calllocation/impl/HttpFetcher.java
+++ b/java/com/android/incallui/calllocation/impl/HttpFetcher.java
@@ -223,6 +223,8 @@ public class HttpFetcher {
   /**
    * Lookup up url re-write rules from gServices and apply to the given url.
    *
+   * <p>https://wiki.corp.google.com/twiki/bin/view/Main/AndroidGservices#URL_Rewriting_Rules
+   *
    * @return The new url.
    */
   private static URL reWriteUrl(Context context, String url) {
diff --git a/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java b/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java
index fc198c724..20460699a 100644
--- a/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java
+++ b/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java
@@ -32,9 +32,9 @@ public abstract class StubCallLocationModule {
   @Binds
   public abstract CallLocation bindCallLocation(StubCallLocation callLocation);
 
-  static public class StubCallLocation implements CallLocation {
+  static class StubCallLocation implements CallLocation {
     @Inject
-    public StubCallLocation() {}
+    StubCallLocation() {}
 
     @Override
     public boolean canGetLocation(@NonNull Context context) {
@@ -44,7 +44,7 @@ public abstract class StubCallLocationModule {
     @Override
     @NonNull
     public Fragment getLocationFragment(@NonNull Context context) {
-      return null;
+      throw Assert.createUnsupportedOperationFailException();
     }
 
     @Override
diff --git a/java/com/android/incallui/incall/impl/AndroidManifest.xml b/java/com/android/incallui/incall/impl/AndroidManifest.xml
index a0e3110d8..3d646506d 100644
--- a/java/com/android/incallui/incall/impl/AndroidManifest.xml
+++ b/java/com/android/incallui/incall/impl/AndroidManifest.xml
@@ -1,3 +1 @@
-<manifest
-  package="com.android.incall.incall.impl">
-</manifest>
+<manifest package="com.android.incallui.incall.impl"/>
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java
index b6ae4902a..02e9b4add 100644
--- a/java/com/android/incallui/incall/impl/InCallFragment.java
+++ b/java/com/android/incallui/incall/impl/InCallFragment.java
@@ -25,11 +25,9 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
 import android.telecom.CallAudioState;
 import android.telephony.TelephonyManager;
 import android.view.LayoutInflater;
@@ -74,8 +72,8 @@ public class InCallFragment extends Fragment
 
   private List<ButtonController> buttonControllers = new ArrayList<>();
   private View endCallButton;
-  private TabLayout tabLayout;
-  private ViewPager pager;
+  private InCallPaginator paginator;
+  private LockableViewPager pager;
   private InCallPagerAdapter adapter;
   private ContactGridManager contactGridManager;
   private InCallScreenDelegate inCallScreenDelegate;
@@ -134,8 +132,8 @@ public class InCallFragment extends Fragment
             getResources().getDimensionPixelSize(R.dimen.incall_avatar_size),
             true /* showAnonymousAvatar */);
 
-    tabLayout = (TabLayout) view.findViewById(R.id.incall_tab_dots);
-    pager = (ViewPager) view.findViewById(R.id.incall_pager);
+    paginator = (InCallPaginator) view.findViewById(R.id.incall_paginator);
+    pager = (LockableViewPager) view.findViewById(R.id.incall_pager);
 
     endCallButton = view.findViewById(R.id.incall_end_call);
     endCallButton.setOnClickListener(this);
@@ -248,8 +246,8 @@ public class InCallFragment extends Fragment
     }
 
     if (adapter.getCount() > 1) {
-      tabLayout.setVisibility(pager.getVisibility());
-      tabLayout.setupWithViewPager(pager, true);
+      paginator.setVisibility(View.VISIBLE);
+      paginator.setupWithViewPager(pager);
       if (!stateRestored) {
         new Handler()
             .postDelayed(
@@ -263,9 +261,9 @@ public class InCallFragment extends Fragment
                   }
                 },
                 2000);
+      } else {
+        paginator.setVisibility(View.GONE);
       }
-    } else {
-      tabLayout.setVisibility(View.GONE);
     }
   }
 
@@ -428,8 +426,15 @@ public class InCallFragment extends Fragment
 
     int visibility = numVisibleButtons == 0 ? View.GONE : View.VISIBLE;
     pager.setVisibility(visibility);
-    if (adapter != null && adapter.getCount() > 1) {
-      tabLayout.setVisibility(visibility);
+    if (adapter != null
+        && adapter.getCount() > 1
+        && getResources().getInteger(R.integer.incall_num_rows) > 1) {
+      paginator.setVisibility(View.VISIBLE);
+      pager.setSwipingLocked(false);
+    } else {
+      paginator.setVisibility(View.GONE);
+      pager.setSwipingLocked(true);
+      pager.setCurrentItem(adapter.getButtonGridPosition());
     }
   }
 
diff --git a/java/com/android/incallui/incall/impl/InCallPaginator.java b/java/com/android/incallui/incall/impl/InCallPaginator.java
new file mode 100644
index 000000000..8ebbd76a2
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/InCallPaginator.java
@@ -0,0 +1,210 @@
+/*
+ * 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.incallui.incall.impl;
+
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.support.annotation.VisibleForTesting;
+import android.support.v4.view.ViewPager;
+import android.support.v4.view.ViewPager.OnPageChangeListener;
+import android.util.AttributeSet;
+import android.view.View;
+import com.android.dialer.common.Assert;
+
+/**
+ * This is the view class for incall paginator visible when a user has EC data attached to their
+ * call. It contains animation methods when the swipe gesture is performed.
+ */
+public class InCallPaginator extends View implements OnPageChangeListener {
+
+  private int dotRadius;
+  private int dotsSeparation;
+
+  private Paint activeDotPaintPortrait;
+  private Paint inactiveDotPaintPortrait;
+
+  private Path inactiveDotPath;
+  private ValueAnimator transitionAnimator;
+  private boolean useModeSwitchTransition;
+
+  private float progress;
+  private boolean toFirstPage;
+  private boolean pageChanged;
+
+  public InCallPaginator(Context context) {
+    super(context);
+    init(context);
+  }
+
+  public InCallPaginator(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    init(context);
+  }
+
+  private void init(Context context) {
+    dotRadius = getResources().getDimensionPixelSize(R.dimen.paginator_dot_radius);
+    dotsSeparation = getResources().getDimensionPixelSize(R.dimen.paginator_dots_separation);
+
+    int activeDotColor = context.getColor(R.color.paginator_dot);
+    int inactiveDotColor = context.getColor(R.color.paginator_path);
+    activeDotPaintPortrait = new Paint(Paint.ANTI_ALIAS_FLAG);
+    activeDotPaintPortrait.setColor(activeDotColor);
+    inactiveDotPaintPortrait = new Paint(Paint.ANTI_ALIAS_FLAG);
+    inactiveDotPaintPortrait.setColor(inactiveDotColor);
+
+    inactiveDotPath = new Path();
+    transitionAnimator = ValueAnimator.ofFloat(0f, 1f);
+    transitionAnimator.setInterpolator(null);
+    transitionAnimator.setCurrentFraction(0f);
+    transitionAnimator.addUpdateListener(animation -> invalidate());
+  }
+
+  @VisibleForTesting
+  public void setProgress(float progress, boolean toFirstPage) {
+    this.progress = progress;
+    this.toFirstPage = toFirstPage;
+
+    // Ensure the dot transition keeps up with the swipe progress.
+    if (transitionAnimator.isStarted() && progress > transitionAnimator.getAnimatedFraction()) {
+      transitionAnimator.setCurrentFraction(progress);
+    }
+
+    invalidate();
+  }
+
+  private void startTransition() {
+    if (transitionAnimator.getAnimatedFraction() < 1f) {
+      transitionAnimator.setCurrentFraction(progress);
+      useModeSwitchTransition = false;
+      transitionAnimator.cancel();
+      transitionAnimator.start();
+    }
+  }
+
+  private void endTransition(boolean snapBack) {
+    if (transitionAnimator.getAnimatedFraction() > 0f) {
+      useModeSwitchTransition = !snapBack;
+      transitionAnimator.cancel();
+      transitionAnimator.reverse();
+    }
+  }
+
+  @Override
+  public void onDraw(Canvas canvas) {
+    super.onDraw(canvas);
+
+    int centerX = getWidth() / 2;
+    int centerY = getHeight() / 2;
+
+    float transitionFraction = (float) transitionAnimator.getAnimatedValue();
+
+    // Draw the inactive "dots".
+    inactiveDotPath.reset();
+    if (useModeSwitchTransition) {
+      float trackWidth = 2 * dotRadius + transitionFraction * (2 * dotRadius + dotsSeparation);
+      float indicatorRadius = dotRadius * (1f - 2f * Math.min(transitionFraction, 0.5f));
+      float indicatorOffset = dotRadius + dotsSeparation / 2;
+      if (toFirstPage) {
+        float trackLeft = centerX - indicatorOffset - dotRadius;
+        inactiveDotPath.addRoundRect(
+            trackLeft,
+            centerY - dotRadius,
+            trackLeft + trackWidth,
+            centerY + dotRadius,
+            dotRadius,
+            dotRadius,
+            Path.Direction.CW);
+        inactiveDotPath.addCircle(
+            centerX + indicatorOffset, centerY, indicatorRadius, Path.Direction.CW);
+      } else {
+        float trackRight = centerX + indicatorOffset + dotRadius;
+        inactiveDotPath.addRoundRect(
+            trackRight - trackWidth,
+            centerY - dotRadius,
+            trackRight,
+            centerY + dotRadius,
+            dotRadius,
+            dotRadius,
+            Path.Direction.CW);
+        inactiveDotPath.addCircle(
+            centerX - indicatorOffset, centerY, indicatorRadius, Path.Direction.CW);
+      }
+    } else {
+      float centerOffset = dotsSeparation / 2f;
+      float innerOffset = centerOffset - transitionFraction * (dotRadius + centerOffset);
+      float outerOffset = 2f * dotRadius + centerOffset;
+      inactiveDotPath.addRoundRect(
+          centerX - outerOffset,
+          centerY - dotRadius,
+          centerX - innerOffset,
+          centerY + dotRadius,
+          dotRadius,
+          dotRadius,
+          Path.Direction.CW);
+      inactiveDotPath.addRoundRect(
+          centerX + innerOffset,
+          centerY - dotRadius,
+          centerX + outerOffset,
+          centerY + dotRadius,
+          dotRadius,
+          dotRadius,
+          Path.Direction.CW);
+    }
+    Paint inactivePaint = inactiveDotPaintPortrait;
+    canvas.drawPath(inactiveDotPath, inactivePaint);
+
+    // Draw the white active dot.
+    float activeDotOffset =
+        (toFirstPage ? 1f - 2f * progress : 2f * progress - 1f) * (dotRadius + dotsSeparation / 2);
+    Paint activePaint = activeDotPaintPortrait;
+    canvas.drawCircle(centerX + activeDotOffset, centerY, dotRadius, activePaint);
+  }
+
+  public void setupWithViewPager(ViewPager pager) {
+    Assert.checkArgument(pager.getAdapter().getCount() == 2, "Invalid page count.");
+    pager.addOnPageChangeListener(this);
+  }
+
+  @Override
+  public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+    setProgress(positionOffset, position != 0);
+  }
+
+  @Override
+  public void onPageSelected(int position) {
+    pageChanged = true;
+  }
+
+  @Override
+  public void onPageScrollStateChanged(int state) {
+    switch (state) {
+      case ViewPager.SCROLL_STATE_IDLE:
+        endTransition(!pageChanged);
+        pageChanged = false;
+        break;
+      case ViewPager.SCROLL_STATE_DRAGGING:
+        startTransition();
+        break;
+      case ViewPager.SCROLL_STATE_SETTLING:
+      default:
+        break;
+    }
+  }
+}
diff --git a/java/com/android/incallui/incall/impl/LockableViewPager.java b/java/com/android/incallui/incall/impl/LockableViewPager.java
new file mode 100644
index 000000000..5b8b12609
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/LockableViewPager.java
@@ -0,0 +1,46 @@
+/*
+ * 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.incallui.incall.impl;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/** {@link ViewPager} useful for disabled swiping between pages. */
+public class LockableViewPager extends ViewPager {
+
+  private boolean swipingLocked;
+
+  public LockableViewPager(Context context, AttributeSet attributeSet) {
+    super(context, attributeSet);
+  }
+
+  public void setSwipingLocked(boolean swipingLocked) {
+    this.swipingLocked = swipingLocked;
+  }
+
+  @Override
+  public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
+    return !swipingLocked && super.onInterceptTouchEvent(motionEvent);
+  }
+
+  @Override
+  public boolean onTouchEvent(MotionEvent motionEvent) {
+    return !swipingLocked && super.onTouchEvent(motionEvent);
+  }
+}
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 9b950462c..e4bc942bb 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
@@ -60,23 +60,21 @@
         android:layout_height="match_parent"/>
     </LinearLayout>
 
-    <android.support.v4.view.ViewPager
+    <com.android.incallui.incall.impl.LockableViewPager
       android:id="@+id/incall_pager"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:layout_above="@+id/incall_tab_dots"
+      android:layout_above="@+id/incall_paginator"
       android:layout_below="@+id/incall_contact_grid"
       android:layout_centerHorizontal="true"/>
 
-    <android.support.design.widget.TabLayout
-      android:id="@+id/incall_tab_dots"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_above="@+id/incall_end_call"
-      android:visibility="gone"
-      app:tabBackground="@drawable/tab_selector"
-      app:tabGravity="center"
-      app:tabIndicatorHeight="0dp"/>
+    <com.android.incallui.incall.impl.InCallPaginator
+        android:id="@+id/incall_paginator"
+        android:layout_height="@dimen/paginator_height"
+        android:layout_width="@dimen/paginator_width"
+        android:layout_above="@+id/incall_end_call"
+        android:layout_centerHorizontal="true"
+        android:visibility="gone"/>
 
     <FrameLayout
       android:id="@+id/incall_dialpad_container"
diff --git a/java/com/android/incallui/incall/impl/res/values/dimens.xml b/java/com/android/incallui/incall/impl/res/values/dimens.xml
index 249788785..72602e3fc 100644
--- a/java/com/android/incallui/incall/impl/res/values/dimens.xml
+++ b/java/com/android/incallui/incall/impl/res/values/dimens.xml
@@ -14,4 +14,9 @@
 
   <bool name="incall_dialpad_allowed">false</bool>
   <integer name="incall_num_rows">0</integer>
+
+  <dimen name="paginator_dot_radius">5dp</dimen>
+  <dimen name="paginator_dots_separation">8dp</dimen>
+  <dimen name="paginator_height">38dp</dimen>
+  <dimen name="paginator_width">72dp</dimen>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values/styles.xml b/java/com/android/incallui/incall/impl/res/values/styles.xml
index 2392574a3..a8cf2ddf1 100644
--- a/java/com/android/incallui/incall/impl/res/values/styles.xml
+++ b/java/com/android/incallui/incall/impl/res/values/styles.xml
@@ -17,6 +17,9 @@
 
 <resources>
 
+  <color name="paginator_dot">#FFF</color>
+  <color name="paginator_path">#66FFFFFF</color>
+
   <style name="DialpadContainer">
     <item name="android:layout_alignParentTop">true</item>
   </style>
diff --git a/java/com/android/incallui/maps/MapsComponent.java b/java/com/android/incallui/maps/MapsComponent.java
index 1ca17b781..796abaa92 100644
--- a/java/com/android/incallui/maps/MapsComponent.java
+++ b/java/com/android/incallui/maps/MapsComponent.java
@@ -19,29 +19,18 @@ package com.android.incallui.maps;
 import android.content.Context;
 import com.android.dialer.inject.HasRootComponent;
 import dagger.Subcomponent;
-import com.android.incallui.maps.stub.StubMapsModule;
 
 /** Subcomponent that can be used to access the maps implementation. */
-public class MapsComponent {
+@Subcomponent
+public abstract class MapsComponent {
 
-  private static MapsComponent instance;
-  private Maps maps;
-
-  public Maps getMaps() {
-    if (maps == null) {
-        maps = new StubMapsModule.StubMaps();
-    }
-    return maps;
-  }
+  public abstract Maps getMaps();
 
   public static MapsComponent get(Context context) {
-    if (instance == null) {
-        instance = new MapsComponent();
-    }
-    return instance;
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .mapsComponent();
   }
 
-
   /** Used to refer to the root application component. */
   public interface HasComponent {
     MapsComponent mapsComponent();
diff --git a/java/com/android/incallui/maps/stub/StubMapsModule.java b/java/com/android/incallui/maps/stub/StubMapsModule.java
index 72678143c..3a193b15d 100644
--- a/java/com/android/incallui/maps/stub/StubMapsModule.java
+++ b/java/com/android/incallui/maps/stub/StubMapsModule.java
@@ -34,7 +34,7 @@ public abstract class StubMapsModule {
   @Singleton
   public abstract Maps bindMaps(StubMaps maps);
 
-  static public final class StubMaps implements Maps {
+  static final class StubMaps implements Maps {
     @Inject
     public StubMaps() {}
 
diff --git a/java/com/android/incallui/res/values-uz/strings.xml b/java/com/android/incallui/res/values-uz/strings.xml
index fcf221f38..585f983ac 100644
--- a/java/com/android/incallui/res/values-uz/strings.xml
+++ b/java/com/android/incallui/res/values-uz/strings.xml
@@ -30,7 +30,7 @@
     <string name="caller_manage_header" msgid="7358710345135355578">"Konferensiya qo‘ng‘irog‘i <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Ovozli pochta raqami"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Raqam terilmoqda"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> qo‘ng‘irog‘i javobsiz qoldirildi"</string>
+    <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>
diff --git a/java/com/android/incallui/videotech/VideoTech.java b/java/com/android/incallui/videotech/VideoTech.java
index fb2641793..bd957b699 100644
--- a/java/com/android/incallui/videotech/VideoTech.java
+++ b/java/com/android/incallui/videotech/VideoTech.java
@@ -27,6 +27,12 @@ public interface VideoTech {
 
   boolean isTransmittingOrReceiving();
 
+  /**
+   * Determines if the answer video UI should open the camera directly instead of letting the video
+   * tech manage the camera.
+   */
+  boolean isSelfManagedCamera();
+
   void onCallStateChanged(int newState);
 
   @SessionModificationState
diff --git a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
index bc8db4c07..c76043540 100644
--- a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
+++ b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
@@ -32,6 +32,11 @@ public class EmptyVideoTech implements VideoTech {
   }
 
   @Override
+  public boolean isSelfManagedCamera() {
+    return false;
+  }
+
+  @Override
   public void onCallStateChanged(int newState) {}
 
   @Override
diff --git a/java/com/android/incallui/videotech/ims/ImsVideoTech.java b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
index 890e5c80c..a37500c3b 100644
--- a/java/com/android/incallui/videotech/ims/ImsVideoTech.java
+++ b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
@@ -58,6 +58,13 @@ public class ImsVideoTech implements VideoTech {
   }
 
   @Override
+  public boolean isSelfManagedCamera() {
+    // Return false to indicate that the answer UI shouldn't open the camera itself.
+    // For IMS Video the modem is responsible for opening the camera.
+    return false;
+  }
+
+  @Override
   public void onCallStateChanged(int newState) {
     if (!isAvailable()) {
       return;
diff --git a/java/com/android/incallui/videotech/rcs/RcsVideoShare.java b/java/com/android/incallui/videotech/rcs/RcsVideoShare.java
index 2cb43036f..1e951408c 100644
--- a/java/com/android/incallui/videotech/rcs/RcsVideoShare.java
+++ b/java/com/android/incallui/videotech/rcs/RcsVideoShare.java
@@ -65,6 +65,11 @@ public class RcsVideoShare implements VideoTech, CapabilitiesListener, VideoShar
   }
 
   @Override
+  public boolean isSelfManagedCamera() {
+    return true;
+  }
+
+  @Override
   public void onCallStateChanged(int newState) {
     if (newState == Call.STATE_DISCONNECTING) {
       enrichedCallManager.unregisterVideoShareListener(this);
diff --git a/java/com/android/voicemail/VisualVoicemailTypeExtensions.java b/java/com/android/voicemail/VisualVoicemailTypeExtensions.java
new file mode 100644
index 000000000..056481059
--- /dev/null
+++ b/java/com/android/voicemail/VisualVoicemailTypeExtensions.java
@@ -0,0 +1,29 @@
+/*
+ * 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.voicemail;
+
+/**
+ * Extended types used by {@link android.provider.VoicemailContract.Status#SOURCE_TYPE} not defined
+ * in {@link android.telephony.TelephonyManager}. {@link
+ * android.telephony.TelephonyManager#VVM_TYPE_OMTP} and {@link
+ * android.telephony.TelephonyManager#VVM_TYPE_CVVM} are already defined.
+ */
+public class VisualVoicemailTypeExtensions {
+
+  // Protocol used by Verizon wireless
+  public static final String VVM_TYPE_VVM3 = "vvm_type_vvm3";
+}
diff --git a/java/com/android/voicemail/VoicemailClient.java b/java/com/android/voicemail/VoicemailClient.java
index b237f65f6..54cffdac6 100644
--- a/java/com/android/voicemail/VoicemailClient.java
+++ b/java/com/android/voicemail/VoicemailClient.java
@@ -45,6 +45,18 @@ public interface VoicemailClient {
    */
   void appendOmtpVoicemailSelectionClause(
       Context context, StringBuilder where, List<String> selectionArgs);
+
+  /**
+   * Appends the selection to ignore voicemail status from non-active OMTP voicemail package. The
+   * {@link android.provider.VoicemailContract.Status#SOURCE_TYPE} is checked against a list of
+   * known OMTP types. Voicemails from {@link #OMTP_VOICEMAIL_BLACKLIST} will also be ignored as
+   * they are voicemail source only valid pre-OC.
+   *
+   * @see #appendOmtpVoicemailSelectionClause(Context, StringBuilder, List)
+   */
+  void appendOmtpVoicemailStatusSelectionClause(
+      Context context, StringBuilder where, List<String> selectionArgs);
+
   /**
    * @return the class name of the {@link android.preference.PreferenceFragment} for voicemail
    *     settings, or {@code null} if dialer cannot control voicemail settings. Always return {@code
diff --git a/java/com/android/voicemail/VoicemailComponent.java b/java/com/android/voicemail/VoicemailComponent.java
index 6dd6f9d90..bed75f0ef 100644
--- a/java/com/android/voicemail/VoicemailComponent.java
+++ b/java/com/android/voicemail/VoicemailComponent.java
@@ -17,26 +17,18 @@
 package com.android.voicemail;
 
 import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
 import dagger.Subcomponent;
-import com.android.voicemail.impl.VoicemailClientImpl;
 
 /** Subcomponent that can be used to access the voicemail implementation. */
-public class VoicemailComponent {
-    private static VoicemailComponent instance;
-    private VoicemailClientImpl voicemailClient;
+@Subcomponent
+public abstract class VoicemailComponent {
 
-  public VoicemailClient getVoicemailClient() {
-    if (voicemailClient == null) {
-        voicemailClient = new VoicemailClientImpl();
-    }
-    return voicemailClient;
-  }
+  public abstract VoicemailClient getVoicemailClient();
 
   public static VoicemailComponent get(Context context) {
-    if (instance == null) {
-        instance = new VoicemailComponent();
-    }
-    return instance;
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .voicemailComponent();
   }
 
   /** Used to refer to the root application component. */
diff --git a/java/com/android/voicemail/impl/AndroidManifest.xml b/java/com/android/voicemail/impl/AndroidManifest.xml
index 0d90d5932..8c0bd3599 100644
--- a/java/com/android/voicemail/impl/AndroidManifest.xml
+++ b/java/com/android/voicemail/impl/AndroidManifest.xml
@@ -85,14 +85,12 @@
       android:name="com.android.voicemail.impl.scheduling.TaskSchedulerService"
       android:exported="false"/>
 
-    <service
-      android:name="com.android.voicemail.impl.OmtpService"
-      android:permission="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"
+    <receiver android:name="com.android.voicemail.impl.OmtpReceiver"
       android:exported="true">
       <intent-filter>
-        <action android:name="android.telephony.VisualVoicemailService"/>
+        <action android:name="com.android.phone.vvm.ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT" />
       </intent-filter>
-    </service>
+    </receiver>
 
     <activity
       android:name="com.android.voicemail.impl.settings.VoicemailChangePinActivity"
diff --git a/java/com/android/voicemail/impl/OmtpReceiver.java b/java/com/android/voicemail/impl/OmtpReceiver.java
new file mode 100644
index 000000000..0b871c478
--- /dev/null
+++ b/java/com/android/voicemail/impl/OmtpReceiver.java
@@ -0,0 +1,87 @@
+/*
+ * 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.voicemail.impl;
+
+import android.annotation.TargetApi;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build.VERSION_CODES;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.VisualVoicemailSms;
+import com.android.dialer.common.Assert;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.nano.DialerImpression;
+import com.android.voicemail.impl.sync.VvmAccountManager;
+
+/** Listens to com.android.phone.vvm.ACTION_TEMP_VISUAL_VOICEMAIL_SERVICE_EVENT */
+@TargetApi(VERSION_CODES.O)
+public class OmtpReceiver extends BroadcastReceiver {
+
+  private static final String TAG = "VvmOmtpReceiver";
+
+  public static final String ACTION_SMS_RECEIVED = "com.android.vociemailomtp.sms.sms_received";
+
+  public static final String EXTRA_VOICEMAIL_SMS = "extra_voicemail_sms";
+
+  private static final String EXTRA_WHAT = "what";
+
+  private static final int MSG_ON_CELL_SERVICE_CONNECTED = 1;
+
+  private static final int MSG_ON_SMS_RECEIVED = 2;
+
+  private static final int MSG_ON_SIM_REMOVED = 3;
+
+  private static final int MSG_TASK_STOPPED = 5;
+
+  private static final String DATA_PHONE_ACCOUNT_HANDLE = "data_phone_account_handle";
+
+  private static final String DATA_SMS = "data_sms";
+
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    int what = intent.getIntExtra(EXTRA_WHAT, -1);
+    PhoneAccountHandle phoneAccountHandle = intent.getParcelableExtra(DATA_PHONE_ACCOUNT_HANDLE);
+    switch (what) {
+      case MSG_ON_CELL_SERVICE_CONNECTED:
+        VvmLog.i(TAG, "onCellServiceConnected");
+        Logger.get(context).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
+        ActivationTask.start(context, phoneAccountHandle, null);
+        break;
+      case MSG_ON_SMS_RECEIVED:
+        VvmLog.i(TAG, "onSmsReceived");
+        Logger.get(context).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
+        VisualVoicemailSms sms = intent.getParcelableExtra(DATA_SMS);
+        Intent receivedIntent = new Intent(ACTION_SMS_RECEIVED);
+        receivedIntent.setPackage(context.getPackageName());
+        receivedIntent.putExtra(EXTRA_VOICEMAIL_SMS, sms);
+        context.sendBroadcast(receivedIntent);
+        break;
+      case MSG_ON_SIM_REMOVED:
+        VvmLog.i(TAG, "onSimRemoved");
+        Logger.get(context).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
+        VvmAccountManager.removeAccount(context, phoneAccountHandle);
+        break;
+      case MSG_TASK_STOPPED:
+        VvmLog.i(TAG, "onStopped");
+        Logger.get(context).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
+        break;
+      default:
+        throw Assert.createIllegalStateFailException("unexpected what: " + what);
+    }
+  }
+}
diff --git a/java/com/android/voicemail/impl/OmtpService.java b/java/com/android/voicemail/impl/OmtpService.java
deleted file mode 100644
index 8b69731b9..000000000
--- a/java/com/android/voicemail/impl/OmtpService.java
+++ /dev/null
@@ -1,69 +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.voicemail.impl;
-
-import android.content.Intent;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.VisualVoicemailService;
-import android.telephony.VisualVoicemailSms;
-import com.android.dialer.logging.Logger;
-import com.android.dialer.logging.nano.DialerImpression;
-import com.android.voicemail.impl.sync.VvmAccountManager;
-
-public class OmtpService extends VisualVoicemailService {
-
-  private static final String TAG = "VvmOmtpService";
-
-  public static final String ACTION_SMS_RECEIVED = "com.android.vociemailomtp.sms.sms_received";
-
-  public static final String EXTRA_VOICEMAIL_SMS = "extra_voicemail_sms";
-
-  @Override
-  public void onCellServiceConnected(
-      VisualVoicemailTask task, final PhoneAccountHandle phoneAccountHandle) {
-    VvmLog.i(TAG, "onCellServiceConnected");
-    Logger.get(this).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
-    ActivationTask.start(OmtpService.this, phoneAccountHandle, null);
-    task.finish();
-  }
-
-  @Override
-  public void onSmsReceived(VisualVoicemailTask task, final VisualVoicemailSms sms) {
-    VvmLog.i(TAG, "onSmsReceived");
-    Logger.get(this).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
-    Intent intent = new Intent(ACTION_SMS_RECEIVED);
-    intent.setPackage(getPackageName());
-    intent.putExtra(EXTRA_VOICEMAIL_SMS, sms);
-    sendBroadcast(intent);
-    task.finish();
-  }
-
-  @Override
-  public void onSimRemoved(
-      final VisualVoicemailTask task, final PhoneAccountHandle phoneAccountHandle) {
-    VvmLog.i(TAG, "onSimRemoved");
-    Logger.get(this).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
-    VvmAccountManager.removeAccount(this, phoneAccountHandle);
-    task.finish();
-  }
-
-  @Override
-  public void onStopped(VisualVoicemailTask task) {
-    VvmLog.i(TAG, "onStopped");
-    Logger.get(this).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
-  }
-}
diff --git a/java/com/android/voicemail/impl/VoicemailClientImpl.java b/java/com/android/voicemail/impl/VoicemailClientImpl.java
index 1ad12aeab..91af18994 100644
--- a/java/com/android/voicemail/impl/VoicemailClientImpl.java
+++ b/java/com/android/voicemail/impl/VoicemailClientImpl.java
@@ -16,12 +16,14 @@ package com.android.voicemail.impl;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build.VERSION_CODES;
+import android.provider.VoicemailContract.Status;
 import android.provider.VoicemailContract.Voicemails;
 import android.support.annotation.Nullable;
 import android.support.v4.os.BuildCompat;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 import com.android.dialer.common.Assert;
+import com.android.voicemail.VisualVoicemailTypeExtensions;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
 import com.android.voicemail.impl.settings.VoicemailSettingsFragment;
@@ -42,6 +44,12 @@ public class VoicemailClientImpl implements VoicemailClient {
    */
   private static final String[] OMTP_VOICEMAIL_BLACKLIST = {"com.android.phone"};
 
+  private static final String[] OMTP_VOICEMAIL_TYPE = {
+    TelephonyManager.VVM_TYPE_OMTP,
+    TelephonyManager.VVM_TYPE_CVVM,
+    VisualVoicemailTypeExtensions.VVM_TYPE_VVM3
+  };
+
   @Inject
   public VoicemailClientImpl() {
     Assert.checkArgument(BuildCompat.isAtLeastO());
@@ -70,21 +78,73 @@ public class VoicemailClientImpl implements VoicemailClient {
       Context context, StringBuilder where, List<String> selectionArgs) {
     TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
     String omtpSource = TelephonyMangerCompat.getVisualVoicemailPackageName(telephonyManager);
-    where.append(
-        "AND ("
-            + "("
-            + Voicemails.IS_OMTP_VOICEMAIL
-            + " != 1)"
-            + "OR "
-            + "("
-            + Voicemails.SOURCE_PACKAGE
-            + " = ? )"
-            + ")");
-    selectionArgs.add(omtpSource);
+    if (where.length() != 0) {
+      where.append(" AND ");
+    }
+    where.append("(");
+    {
+      where.append("(");
+      {
+        where.append(Voicemails.IS_OMTP_VOICEMAIL).append(" != 1");
+        where.append(")");
+      }
+      where.append(" OR ");
+      where.append("(");
+      {
+        where.append(Voicemails.SOURCE_PACKAGE).append(" = ?");
+        selectionArgs.add(omtpSource);
+        where.append(")");
+      }
+      where.append(")");
+    }
 
     for (String blacklistedPackage : OMTP_VOICEMAIL_BLACKLIST) {
-      where.append("AND (" + Voicemails.SOURCE_PACKAGE + "!= ?)");
+      where.append("AND (").append(Voicemails.SOURCE_PACKAGE).append("!= ?)");
       selectionArgs.add(blacklistedPackage);
     }
   }
+
+  @TargetApi(VERSION_CODES.O)
+  @Override
+  public void appendOmtpVoicemailStatusSelectionClause(
+      Context context, StringBuilder where, List<String> selectionArgs) {
+    TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+    String omtpSource = TelephonyMangerCompat.getVisualVoicemailPackageName(telephonyManager);
+    if (where.length() != 0) {
+      where.append(" AND ");
+    }
+    where.append("(");
+    {
+      where.append("(");
+      {
+        where.append(Status.SOURCE_PACKAGE).append(" = ? ");
+        selectionArgs.add(omtpSource);
+        where.append(")");
+      }
+      where.append(" OR NOT (");
+      {
+        for (int i = 0; i < OMTP_VOICEMAIL_TYPE.length; i++) {
+          if (i != 0) {
+            where.append(" OR ");
+          }
+          where.append(" (");
+          {
+            where.append(Status.SOURCE_TYPE).append(" == ?");
+            selectionArgs.add(OMTP_VOICEMAIL_TYPE[i]);
+            where.append(")");
+          }
+        }
+        where.append(")");
+      }
+      for (String blacklistedPackage : OMTP_VOICEMAIL_BLACKLIST) {
+        where.append("AND (");
+        {
+          where.append(Voicemails.SOURCE_PACKAGE).append("!= ?");
+          selectionArgs.add(blacklistedPackage);
+          where.append(")");
+        }
+      }
+      where.append(")");
+    }
+  }
 }
diff --git a/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java b/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java
index 056fb2eaf..ef27c2202 100644
--- a/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java
+++ b/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java
@@ -19,14 +19,13 @@ package com.android.voicemail.impl.protocol;
 import android.content.res.Resources;
 import android.support.annotation.Nullable;
 import android.telephony.TelephonyManager;
+import com.android.voicemail.VisualVoicemailTypeExtensions;
 import com.android.voicemail.impl.VvmLog;
 
 public class VisualVoicemailProtocolFactory {
 
   private static final String TAG = "VvmProtocolFactory";
 
-  private static final String VVM_TYPE_VVM3 = "vvm_type_vvm3";
-
   @Nullable
   public static VisualVoicemailProtocol create(Resources resources, String type) {
     if (type == null) {
@@ -37,7 +36,7 @@ public class VisualVoicemailProtocolFactory {
         return new OmtpProtocol();
       case TelephonyManager.VVM_TYPE_CVVM:
         return new CvvmProtocol();
-      case VVM_TYPE_VVM3:
+      case VisualVoicemailTypeExtensions.VVM_TYPE_VVM3:
         return new Vvm3Protocol();
       default:
         VvmLog.e(TAG, "Unexpected visual voicemail type: " + type);
diff --git a/java/com/android/voicemail/impl/res/values-af/strings.xml b/java/com/android/voicemail/impl/res/values-af/strings.xml
index f3697271e..d71e534e7 100644
--- a/java/com/android/voicemail/impl/res/values-af/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-af/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibreer"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibreer"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Klank"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Gevorderde instellings"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-am/strings.xml b/java/com/android/voicemail/impl/res/values-am/strings.xml
index 5c371a912..8376fa1ae 100644
--- a/java/com/android/voicemail/impl/res/values-am/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-am/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"ንዘር"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"ንዘር"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ድምፅ"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"የላቁ ቅንብሮች"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ar/strings.xml b/java/com/android/voicemail/impl/res/values-ar/strings.xml
index c6d5ab822..e71245b57 100644
--- a/java/com/android/voicemail/impl/res/values-ar/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ar/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"اهتزاز"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"اهتزاز"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"صوت"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"الإعدادات المتقدمة"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-az/strings.xml b/java/com/android/voicemail/impl/res/values-az/strings.xml
index 6376f06ff..e6439d49e 100644
--- a/java/com/android/voicemail/impl/res/values-az/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-az/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrasiya"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrasiya"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Səs"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Qabaqcıl Ayarlar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-be/strings.xml b/java/com/android/voicemail/impl/res/values-be/strings.xml
index fdbd93a60..af715c89a 100644
--- a/java/com/android/voicemail/impl/res/values-be/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-be/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Вібрацыя"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Вібрацыя"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Гук"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Пашыраныя налады"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-bg/strings.xml b/java/com/android/voicemail/impl/res/values-bg/strings.xml
index f9871b4b2..3f56075a9 100644
--- a/java/com/android/voicemail/impl/res/values-bg/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bg/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Вибриране"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Вибриране"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Звук"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Разширени настройки"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-bn/strings.xml b/java/com/android/voicemail/impl/res/values-bn/strings.xml
index 99b2ec7cb..5907b5933 100644
--- a/java/com/android/voicemail/impl/res/values-bn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bn/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"কম্পন"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"কম্পন"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"শব্দ"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"উন্নত সেটিংস"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-bs/strings.xml b/java/com/android/voicemail/impl/res/values-bs/strings.xml
index 2e9102876..f8c09dd1c 100644
--- a/java/com/android/voicemail/impl/res/values-bs/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bs/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibracija"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibracija"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Zvuk"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Napredne postavke"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ca/strings.xml b/java/com/android/voicemail/impl/res/values-ca/strings.xml
index 62b27a433..dab846582 100644
--- a/java/com/android/voicemail/impl/res/values-ca/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ca/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibra"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibra"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"So"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configuració avançada"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-cs/strings.xml b/java/com/android/voicemail/impl/res/values-cs/strings.xml
index 91bbbace9..b949266a3 100644
--- a/java/com/android/voicemail/impl/res/values-cs/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-cs/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrace"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrace"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Zvuk"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Pokročilá nastavení"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-da/strings.xml b/java/com/android/voicemail/impl/res/values-da/strings.xml
index 4eb4c96c5..36a5a2442 100644
--- a/java/com/android/voicemail/impl/res/values-da/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-da/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrer"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrer"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Lyd"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Avancerede indstillinger"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-de/strings.xml b/java/com/android/voicemail/impl/res/values-de/strings.xml
index 9f491546f..545682298 100644
--- a/java/com/android/voicemail/impl/res/values-de/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-de/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrieren"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrieren"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Ton"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Erweiterte Einstellungen"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-el/strings.xml b/java/com/android/voicemail/impl/res/values-el/strings.xml
index 4d4b29493..d0049e247 100644
--- a/java/com/android/voicemail/impl/res/values-el/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-el/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Δόνηση"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Δόνηση"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Ήχος"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Σύνθετες ρυθμίσεις"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml b/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml
index 37e536536..ad30b2c93 100644
--- a/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrate"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Sound"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Advanced settings"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml b/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml
index 37e536536..ad30b2c93 100644
--- a/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrate"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Sound"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Advanced settings"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml b/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml
index 37e536536..ad30b2c93 100644
--- a/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrate"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Sound"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Advanced settings"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml b/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml
index 1b606883e..037fb1bb8 100644
--- a/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Sonido"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configuración avanzada"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-es/strings.xml b/java/com/android/voicemail/impl/res/values-es/strings.xml
index 970eea8e9..7183201b9 100644
--- a/java/com/android/voicemail/impl/res/values-es/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-es/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibración"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Sonido"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configuración avanzada"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-et/strings.xml b/java/com/android/voicemail/impl/res/values-et/strings.xml
index 21f6f0365..90ad8f088 100644
--- a/java/com/android/voicemail/impl/res/values-et/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-et/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibreerimine"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibreerimine"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Heli"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Täpsemad seaded"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-eu/strings.xml b/java/com/android/voicemail/impl/res/values-eu/strings.xml
index a3a7ad882..719cd1974 100644
--- a/java/com/android/voicemail/impl/res/values-eu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-eu/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Dardara"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Dardara"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Soinua"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Ezarpen aurreratuak"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-fa/strings.xml b/java/com/android/voicemail/impl/res/values-fa/strings.xml
index ff1febc76..f997f12fd 100644
--- a/java/com/android/voicemail/impl/res/values-fa/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fa/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"لرزش"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"لرزش"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"صدا"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"تنظیمات پیشرفته"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-fi/strings.xml b/java/com/android/voicemail/impl/res/values-fi/strings.xml
index 7a452bcc8..58a162ca1 100644
--- a/java/com/android/voicemail/impl/res/values-fi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fi/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Värinä"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Värinä"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Ääni"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Lisäasetukset"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml b/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml
index 58afe5764..dcd96afc0 100644
--- a/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibreur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibreur"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Son"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Paramètres avancés"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-fr/strings.xml b/java/com/android/voicemail/impl/res/values-fr/strings.xml
index ed40a8a5c..8e7162e14 100644
--- a/java/com/android/voicemail/impl/res/values-fr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fr/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibreur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibreur"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Sonnerie"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Paramètres avancés"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-gl/strings.xml b/java/com/android/voicemail/impl/res/values-gl/strings.xml
index 206acfc57..25833bcbc 100644
--- a/java/com/android/voicemail/impl/res/values-gl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-gl/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibración"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibración"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Son"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configuración avanzada"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-gu/strings.xml b/java/com/android/voicemail/impl/res/values-gu/strings.xml
index 114f01612..5ccc48fe0 100644
--- a/java/com/android/voicemail/impl/res/values-gu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-gu/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"વાઇબ્રેટ"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"વાઇબ્રેટ"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ધ્વનિ"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"વિગતવાર સેટિંગ્સ"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-hi/strings.xml b/java/com/android/voicemail/impl/res/values-hi/strings.xml
index 08a1ed848..58f793e73 100644
--- a/java/com/android/voicemail/impl/res/values-hi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hi/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"कंपन"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"कंपन"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ध्वनि"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"उन्नत सेटिंग"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-hr/strings.xml b/java/com/android/voicemail/impl/res/values-hr/strings.xml
index 71c7511b0..53c496932 100644
--- a/java/com/android/voicemail/impl/res/values-hr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hr/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibriranje"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibriranje"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Zvuk"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Napredne postavke"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-hu/strings.xml b/java/com/android/voicemail/impl/res/values-hu/strings.xml
index f7e670ccc..ce9376a46 100644
--- a/java/com/android/voicemail/impl/res/values-hu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hu/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Rezgés"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Rezgés"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Hang"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Speciális beállítások"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-hy/strings.xml b/java/com/android/voicemail/impl/res/values-hy/strings.xml
index a5dab4558..89b72eec1 100644
--- a/java/com/android/voicemail/impl/res/values-hy/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hy/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Թրթռոց"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Թրթռոց"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Ձայն"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Ընդլայնված կարգավորումներ"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-in/strings.xml b/java/com/android/voicemail/impl/res/values-in/strings.xml
index 48b31bba8..318ae52d6 100644
--- a/java/com/android/voicemail/impl/res/values-in/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-in/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Getar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Getar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Suara"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Setelan Lanjutan"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-is/strings.xml b/java/com/android/voicemail/impl/res/values-is/strings.xml
index aa4622dd7..360058c5c 100644
--- a/java/com/android/voicemail/impl/res/values-is/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-is/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Titringur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Titringur"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Hljóð"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Ítarlegar stillingar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-it/strings.xml b/java/com/android/voicemail/impl/res/values-it/strings.xml
index 13f69c5f0..67cf21a89 100644
--- a/java/com/android/voicemail/impl/res/values-it/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-it/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrazione"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrazione"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Suono"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Impostazioni avanzate"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-iw/strings.xml b/java/com/android/voicemail/impl/res/values-iw/strings.xml
index 874b5abe1..459345540 100644
--- a/java/com/android/voicemail/impl/res/values-iw/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-iw/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"רטט"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"רטט"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"צליל"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"הגדרות מתקדמות"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ja/strings.xml b/java/com/android/voicemail/impl/res/values-ja/strings.xml
index 04c4675dc..1033630f5 100644
--- a/java/com/android/voicemail/impl/res/values-ja/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ja/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"バイブレーション"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"バイブレーション"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"通知音"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"詳細設定"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ka/strings.xml b/java/com/android/voicemail/impl/res/values-ka/strings.xml
index 68b51a3de..16677fac8 100644
--- a/java/com/android/voicemail/impl/res/values-ka/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ka/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"ვიბრაცია"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"ვიბრაცია"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ხმა"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"გაფართოებული პარამეტრები"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-kk/strings.xml b/java/com/android/voicemail/impl/res/values-kk/strings.xml
index 8f1ac972e..3e65922ff 100644
--- a/java/com/android/voicemail/impl/res/values-kk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-kk/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Діріл"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Діріл"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Дыбыс"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Қосымша параметрлер"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-km/strings.xml b/java/com/android/voicemail/impl/res/values-km/strings.xml
index 6ddf1a73d..72a6f0456 100644
--- a/java/com/android/voicemail/impl/res/values-km/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-km/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"ញ័រ"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"ញ័រ"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"សំឡេង"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"ការកំណត់កម្រិតខ្ពស់"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-kn/strings.xml b/java/com/android/voicemail/impl/res/values-kn/strings.xml
index 2cb811dca..66336cd60 100644
--- a/java/com/android/voicemail/impl/res/values-kn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-kn/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"ವೈಬ್ರೇಟ್‌"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"ವೈಬ್ರೇಟ್‌"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ಶಬ್ದ"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ko/strings.xml b/java/com/android/voicemail/impl/res/values-ko/strings.xml
index 729ef9141..c9e2784cd 100644
--- a/java/com/android/voicemail/impl/res/values-ko/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ko/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"진동"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"진동"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"소리"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"고급 설정"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ky/strings.xml b/java/com/android/voicemail/impl/res/values-ky/strings.xml
index 922fbf6c9..35e70b017 100644
--- a/java/com/android/voicemail/impl/res/values-ky/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ky/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Дирилдөө"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Дирилдөө"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Үн"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Өркүндөтүлгөн жөндөөлөр"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-lo/strings.xml b/java/com/android/voicemail/impl/res/values-lo/strings.xml
index b92d8d626..84abbe1b6 100644
--- a/java/com/android/voicemail/impl/res/values-lo/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lo/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"ສັ່ນເຕືອນ"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"ສັ່ນເຕືອນ"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ສຽງ"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"ການຕັ້ງຄ່າຂັ້ນສູງ"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-lt/strings.xml b/java/com/android/voicemail/impl/res/values-lt/strings.xml
index 6d298d333..ae3cd4cc6 100644
--- a/java/com/android/voicemail/impl/res/values-lt/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lt/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibruoti"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibravimas"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Garsas"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Išplėstiniai nustatymai"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-lv/strings.xml b/java/com/android/voicemail/impl/res/values-lv/strings.xml
index 4cde6a83a..c961ba8b4 100644
--- a/java/com/android/voicemail/impl/res/values-lv/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lv/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrācija"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrācija"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Signāls"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Papildu iestatījumi"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-mk/strings.xml b/java/com/android/voicemail/impl/res/values-mk/strings.xml
index fb4a465fd..6f2188ad8 100644
--- a/java/com/android/voicemail/impl/res/values-mk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mk/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Вибрации"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Вибрации"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Звук"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Напредни поставки"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ml/strings.xml b/java/com/android/voicemail/impl/res/values-ml/strings.xml
index 9aff23146..0e912212d 100644
--- a/java/com/android/voicemail/impl/res/values-ml/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ml/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ശബ്‌ദം"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"വിപുലമായ ക്രമീകരണം"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-mn/strings.xml b/java/com/android/voicemail/impl/res/values-mn/strings.xml
index 68dc5bee0..aa9cbedd5 100644
--- a/java/com/android/voicemail/impl/res/values-mn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mn/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Чичиргээ"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Чичиргээ"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Дуу"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Нарийвчилсан тохиргоо"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-mr/strings.xml b/java/com/android/voicemail/impl/res/values-mr/strings.xml
index f0607282f..1c13e9dd6 100644
--- a/java/com/android/voicemail/impl/res/values-mr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mr/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"कंपन करा"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"कंपन करा"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ध्वनी"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"प्रगत सेटिंग्ज"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ms/strings.xml b/java/com/android/voicemail/impl/res/values-ms/strings.xml
index c84d99d12..12724d4a5 100644
--- a/java/com/android/voicemail/impl/res/values-ms/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ms/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Bergetar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Bergetar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Bunyi"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Tetapan Terperinci"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-my/strings.xml b/java/com/android/voicemail/impl/res/values-my/strings.xml
index 010c42187..a7b96adf5 100644
--- a/java/com/android/voicemail/impl/res/values-my/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-my/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"တုန်ခါမှု"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"တုန်ခါမှု"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"အသံ"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"အဆင့်မြင့် ဆက်တင်များ"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-nb/strings.xml b/java/com/android/voicemail/impl/res/values-nb/strings.xml
index ccebb9350..2398de13f 100644
--- a/java/com/android/voicemail/impl/res/values-nb/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-nb/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrering"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrering"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Lyd"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Avanserte innstillinger"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ne/strings.xml b/java/com/android/voicemail/impl/res/values-ne/strings.xml
index 1165a5269..ecf5a46ac 100644
--- a/java/com/android/voicemail/impl/res/values-ne/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ne/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"कम्पन"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"कम्पन"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"आवाज"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"उन्नत सेटिङहरू"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-nl/strings.xml b/java/com/android/voicemail/impl/res/values-nl/strings.xml
index 058ef4ba3..5078c0a91 100644
--- a/java/com/android/voicemail/impl/res/values-nl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-nl/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Trillen"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Trillen"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Geluid"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Geavanceerde instellingen"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-no/strings.xml b/java/com/android/voicemail/impl/res/values-no/strings.xml
index ccebb9350..2398de13f 100644
--- a/java/com/android/voicemail/impl/res/values-no/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-no/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrering"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrering"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Lyd"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Avanserte innstillinger"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-pa/strings.xml b/java/com/android/voicemail/impl/res/values-pa/strings.xml
index 9e1000f03..a754ce200 100644
--- a/java/com/android/voicemail/impl/res/values-pa/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pa/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"ਵਾਈਬ੍ਰੇਟ ਕਰੋ"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"ਵਾਈਬ੍ਰੇਟ ਕਰੋ"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ਧੁਨੀ"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"ਉੱਨਤ ਸੈਟਿੰਗਾਂ"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-pl/strings.xml b/java/com/android/voicemail/impl/res/values-pl/strings.xml
index 762bd6973..3453ede88 100644
--- a/java/com/android/voicemail/impl/res/values-pl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pl/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Wibracje"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Wibracje"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Dźwięk"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Ustawienia zaawansowane"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml b/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml
index 673f5f03f..4d7691bc9 100644
--- a/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibração"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibração"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Som"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configurações avançadas"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml b/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml
index 604449c88..18848e119 100644
--- a/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Som"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Definições avançadas"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-pt/strings.xml b/java/com/android/voicemail/impl/res/values-pt/strings.xml
index 673f5f03f..4d7691bc9 100644
--- a/java/com/android/voicemail/impl/res/values-pt/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pt/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibração"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibração"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Som"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configurações avançadas"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ro/strings.xml b/java/com/android/voicemail/impl/res/values-ro/strings.xml
index 2c96319d4..d3a5cd7e0 100644
--- a/java/com/android/voicemail/impl/res/values-ro/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ro/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrații"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrații"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Sunet"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Setări avansate"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ru/strings.xml b/java/com/android/voicemail/impl/res/values-ru/strings.xml
index 7d6682d9c..7a9692ead 100644
--- a/java/com/android/voicemail/impl/res/values-ru/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ru/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Вибросигнал"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Вибросигнал"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Звук"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Расширенные настройки"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-si/strings.xml b/java/com/android/voicemail/impl/res/values-si/strings.xml
index 841344f84..9351ddc1d 100644
--- a/java/com/android/voicemail/impl/res/values-si/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-si/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"කම්පනය"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"කම්පනය කරන්න"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"හඬ"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"උසස් සැකසීම්"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sk/strings.xml b/java/com/android/voicemail/impl/res/values-sk/strings.xml
index e0caaa554..afc6251d0 100644
--- a/java/com/android/voicemail/impl/res/values-sk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sk/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrovať"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrovať"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Zvuk"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Rozšírené nastavenia"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sl/strings.xml b/java/com/android/voicemail/impl/res/values-sl/strings.xml
index e8b0ed4a2..3fef50626 100644
--- a/java/com/android/voicemail/impl/res/values-sl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sl/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibriranje"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibriranje"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Zvok"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Dodatne nastavitve"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sq/strings.xml b/java/com/android/voicemail/impl/res/values-sq/strings.xml
index 6008696fd..de72b01d4 100644
--- a/java/com/android/voicemail/impl/res/values-sq/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sq/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Dridhje"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Dridhje"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Tingulli"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Cilësimet e përparuara"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sr/strings.xml b/java/com/android/voicemail/impl/res/values-sr/strings.xml
index 1fcb4d377..27fc4dd03 100644
--- a/java/com/android/voicemail/impl/res/values-sr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sr/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Вибрација"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Вибрација"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Звук"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Напредна подешавања"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sv/strings.xml b/java/com/android/voicemail/impl/res/values-sv/strings.xml
index 75bf003bb..196e9ffc6 100644
--- a/java/com/android/voicemail/impl/res/values-sv/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sv/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Vibrera"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Vibrera"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Ljud"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Avancerade inställningar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sw/strings.xml b/java/com/android/voicemail/impl/res/values-sw/strings.xml
index 70c5bd142..6c16d66ca 100644
--- a/java/com/android/voicemail/impl/res/values-sw/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sw/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Mtetemo"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Tetema"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Mlio"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Mipangilio ya Kina"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ta/strings.xml b/java/com/android/voicemail/impl/res/values-ta/strings.xml
index 55ca94399..353818a43 100644
--- a/java/com/android/voicemail/impl/res/values-ta/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ta/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"அதிர்வுறுதல்"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"அதிர்வுறு"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ஒலி"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"மேம்பட்ட அமைப்புகள்"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-te/strings.xml b/java/com/android/voicemail/impl/res/values-te/strings.xml
index 6ede48942..0b70bc146 100644
--- a/java/com/android/voicemail/impl/res/values-te/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-te/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"వైబ్రేషన్"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"వైబ్రేషన్"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"ధ్వని"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"అధునాతన సెట్టింగ్‌లు"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-th/strings.xml b/java/com/android/voicemail/impl/res/values-th/strings.xml
index d42a1fa18..87007741f 100644
--- a/java/com/android/voicemail/impl/res/values-th/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-th/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"สั่น"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"สั่น"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"เสียง"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"การตั้งค่าขั้นสูง"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-tl/strings.xml b/java/com/android/voicemail/impl/res/values-tl/strings.xml
index 20c7883cd..9d42fb0f1 100644
--- a/java/com/android/voicemail/impl/res/values-tl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-tl/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"I-vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"I-vibrate"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Tunog"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Mga Advanced na Setting"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-tr/strings.xml b/java/com/android/voicemail/impl/res/values-tr/strings.xml
index 9826da9b1..05d5b5f0d 100644
--- a/java/com/android/voicemail/impl/res/values-tr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-tr/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Titreşim"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Titreşim"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Ses"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Gelişmiş Ayarlar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-uk/strings.xml b/java/com/android/voicemail/impl/res/values-uk/strings.xml
index a834b1aaa..d16e82f77 100644
--- a/java/com/android/voicemail/impl/res/values-uk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-uk/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Вібросигнал"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Вібросигнал"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Звук"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Розширені налаштування"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ur/strings.xml b/java/com/android/voicemail/impl/res/values-ur/strings.xml
index 172b9a0b6..625b0e490 100644
--- a/java/com/android/voicemail/impl/res/values-ur/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ur/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"ارتعاش"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"ارتعاش"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"آواز"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"اعلی ترتیبات"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-uz/strings.xml b/java/com/android/voicemail/impl/res/values-uz/strings.xml
index 3eff81525..9d33bfff6 100644
--- a/java/com/android/voicemail/impl/res/values-uz/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-uz/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Tebranish"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Tebranish"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Ovoz"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Kengaytirilgan sozlamalar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-vi/strings.xml b/java/com/android/voicemail/impl/res/values-vi/strings.xml
index 70c00add6..76aac53e5 100644
--- a/java/com/android/voicemail/impl/res/values-vi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-vi/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Rung"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Rung"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Âm báo"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Cài đặt nâng cao"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml
index 5a97d46d2..5a02f0154 100644
--- a/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"振动"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"振动"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"提示音"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"高级设置"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml
index 6ea784ad0..59feff713 100644
--- a/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"震動"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"震動"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"音效"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"進階設定"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml
index 6ea784ad0..59feff713 100644
--- a/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"震動"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"震動"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"音效"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"進階設定"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-zu/strings.xml b/java/com/android/voicemail/impl/res/values-zu/strings.xml
index 2138b672c..222b2030a 100644
--- a/java/com/android/voicemail/impl/res/values-zu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zu/strings.xml
@@ -16,8 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
+    <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Dlidlizela"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Dlidlizela"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Umsindo"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Izilungiselelo ezithuthukisiwe"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
+    <skip />
+    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
+    <skip />
+    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
+    <skip />
+    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
+    <skip />
+    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
+    <skip />
+    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
+    <skip />
+    <!-- no translation found for change_pin_title (1363830310845461697) -->
+    <skip />
+    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
+    <skip />
+    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
+    <skip />
+    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
+    <skip />
+    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
+    <skip />
+    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
+    <skip />
+    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
+    <skip />
+    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
+    <skip />
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values/strings.xml b/java/com/android/voicemail/impl/res/values/strings.xml
index 6c3d5527b..f18213b49 100644
--- a/java/com/android/voicemail/impl/res/values/strings.xml
+++ b/java/com/android/voicemail/impl/res/values/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
   <!-- Title of the "Voicemail" settings screen, with a text label identifying which SIM the settings are for. -->
-  <string translatable="false" name="voicemail_settings_with_label">Voicemail (<xliff:g id="subscriptionlabel" example="Mock Carrier">%s</xliff:g>)</string>
+  <string name="voicemail_settings_with_label">Voicemail (<xliff:g example="Mock Carrier" id="subscriptionlabel">%s</xliff:g>)</string>
 
   <!-- Call settings screen, setting option name -->
-  <string translatable="false" name="voicemail_settings_title">Voicemail</string>
+  <string name="voicemail_settings_title">Voicemail</string>
 
   <!-- DO NOT TRANSLATE. Internal key for a voicemail notification preference. -->
-  <string translatable="false" name="voicemail_notification_ringtone_key">voicemail_notification_ringtone_key</string>
+  <string name="voicemail_notification_ringtone_key" translatable="false">voicemail_notification_ringtone_key</string>
   <!-- DO NOT TRANSLATE. Internal key for a voicemail notification preference. -->
-  <string translatable="false" name="voicemail_notification_vibrate_key">voicemail_notification_vibrate_key</string>
+  <string name="voicemail_notification_vibrate_key" translatable="false">voicemail_notification_vibrate_key</string>
 
   <!-- Title for the vibration settings for voicemail notifications [CHAR LIMIT=40] -->
   <string name="voicemail_notification_vibrate_when_title">Vibrate</string>
@@ -36,79 +36,84 @@
          which sound to play when a voicemail notification is received.
          [CHAR LIMIT=30] -->
   <string name="voicemail_notification_ringtone_title">Sound</string>
-  <string translatable="false" name="voicemail_advanced_settings_key">voicemail_advanced_settings_key</string>
+  <string name="voicemail_advanced_settings_key" translatable="false">voicemail_advanced_settings_key</string>
 
   <!-- Title for advanced settings in the voicemail settings -->
   <string name="voicemail_advanced_settings_title">Advanced Settings</string>
 
   <!-- DO NOT TRANSLATE. Internal key for a visual voicemail preference. -->
-    <string translatable="false" name="voicemail_visual_voicemail_key">
+    <string name="voicemail_visual_voicemail_key" translatable="false">
         voicemail_visual_voicemail_key
     </string>
   <!-- DO NOT TRANSLATE. Internal key for a visual voicemail archive preference. -->
-    <string translatable="false" name="voicemail_visual_voicemail_archive_key">
+    <string name="voicemail_visual_voicemail_archive_key" translatable="false">
         archive_is_enabled
     </string>
   <!-- DO NOT TRANSLATE. Internal key for a voicemail change pin preference. -->
-  <string translatable="false" name="voicemail_change_pin_key">voicemail_change_pin_key</string>
+  <string name="voicemail_change_pin_key" translatable="false">voicemail_change_pin_key</string>
 
   <!-- Visual voicemail on/off title [CHAR LIMIT=40] -->
-  <string translatable="false" name="voicemail_visual_voicemail_switch_title">Visual Voicemail</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visual Voicemail</string>
 
   <!-- Visual voicemail archive on/off title [CHAR LIMIT=40] -->
-  <string translatable="false" name="voicemail_visual_voicemail_auto_archive_switch_title">
-    Voicemail Auto Archive
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">
+    Extra backup and storage
   </string>
+  <!-- Visual voicemail archive temporary description [CHAR LIMIT=40] -->
+  <string name="voicemail_visual_voicemail_auto_archive_temporary_disclaimer">
+  <b><i>This is a experimental feature</i></b> we are currently testing. This will potentially delete voicemails from your voicemail server. There are no guarantees of supporting this feature in the future. We would love feedback on the feature though."
+  </string>
+
 
   <!-- Voicemail change PIN dialog title [CHAR LIMIT=40] -->
-  <string translatable="false" name="voicemail_set_pin_dialog_title">Set PIN</string>
+  <string name="voicemail_set_pin_dialog_title">Set PIN</string>
   <!-- Voicemail change PIN dialog title [CHAR LIMIT=40] -->
-  <string translatable="false" name="voicemail_change_pin_dialog_title">Change PIN</string>
+  <string name="voicemail_change_pin_dialog_title">Change PIN</string>
 
   <!-- Hint for the old PIN field in the change vociemail PIN dialog -->
-  <string translatable="false" name="vm_change_pin_old_pin">Old PIN</string>
+  <string name="vm_change_pin_old_pin">Old PIN</string>
   <!-- Hint for the new PIN field in the change vociemail PIN dialog -->
-  <string translatable="false" name="vm_change_pin_new_pin">New PIN</string>
+  <string name="vm_change_pin_new_pin">New PIN</string>
 
   <!-- Message on the dialog when PIN changing is in progress -->
-  <string translatable="false" name="vm_change_pin_progress_message">Please wait.</string>
+  <string name="vm_change_pin_progress_message">Please wait.</string>
   <!-- Error message for the voicemail PIN change if the PIN is too short -->
-  <string translatable="false" name="vm_change_pin_error_too_short">The new PIN is too short.</string>
+  <string name="vm_change_pin_error_too_short">The new PIN is too short.</string>
   <!-- Error message for the voicemail PIN change if the PIN is too long -->
-  <string translatable="false" name="vm_change_pin_error_too_long">The new PIN is too long.</string>
+  <string name="vm_change_pin_error_too_long">The new PIN is too long.</string>
   <!-- Error message for the voicemail PIN change if the PIN is too weak -->
-  <string translatable="false" name="vm_change_pin_error_too_weak">The new PIN is too weak. A strong password should not have continuous sequence or repeated digits.</string>
+  <string name="vm_change_pin_error_too_weak">The new PIN is too weak. A strong password should not have continuous sequence or repeated digits.</string>
   <!-- Error message for the voicemail PIN change if the old PIN entered doesn't match  -->
-  <string translatable="false" name="vm_change_pin_error_mismatch">The old PIN does not match.</string>
+  <string name="vm_change_pin_error_mismatch">The old PIN does not match.</string>
   <!-- Error message for the voicemail PIN change if the new PIN contains invalid character -->
-  <string translatable="false" name="vm_change_pin_error_invalid">The new PIN contains invalid characters.</string>
+  <string name="vm_change_pin_error_invalid">The new PIN contains invalid characters.</string>
   <!-- Error message for the voicemail PIN change if operation has failed -->
-  <string translatable="false" name="vm_change_pin_error_system_error">Unable to change PIN</string>
+  <string name="vm_change_pin_error_system_error">Unable to change PIN</string>
   <!-- Message to replace the transcription if a visual voicemail message is not supported-->
-  <string translatable="false" name="vvm_unsupported_message_format">Unsupported message type, call <xliff:g id="number" example="*86">%s</xliff:g> to listen.</string>
+  <string name="vvm_unsupported_message_format">Unsupported message type, call <xliff:g example="*86" id="number">%s</xliff:g> to listen.</string>
 
   <!-- The title for the change voicemail PIN activity -->
-  <string translatable="false" name="change_pin_title">Change Voicemail PIN</string>
+  <string name="change_pin_title">Change Voicemail PIN</string>
   <!-- The label for the continue button in change voicemail PIN activity -->
-  <string translatable="false" name="change_pin_continue_label">Continue</string>
+  <string name="change_pin_continue_label">Continue</string>
   <!-- The label for the cancel button in change voicemail PIN activity -->
-  <string translatable="false" name="change_pin_cancel_label">Cancel</string>
+  <string name="change_pin_cancel_label">Cancel</string>
   <!-- The label for the ok button in change voicemail PIN activity -->
-  <string translatable="false" name="change_pin_ok_label">Ok</string>
+  <string name="change_pin_ok_label">Ok</string>
   <!-- The title for the enter old pin step in change voicemail PIN activity -->
-  <string translatable="false" name="change_pin_enter_old_pin_header">Confirm your old PIN</string>
+  <string name="change_pin_enter_old_pin_header">Confirm your old PIN</string>
   <!-- The hint for the enter old pin step in change voicemail PIN activity -->
-  <string translatable="false" name="change_pin_enter_old_pin_hint">Enter your voicemail PIN to continue.</string>
+  <string name="change_pin_enter_old_pin_hint">Enter your voicemail PIN to continue.</string>
   <!-- The title for the enter new pin step in change voicemail PIN activity -->
-  <string translatable="false" name="change_pin_enter_new_pin_header">Set a new PIN</string>
+  <string name="change_pin_enter_new_pin_header">Set a new PIN</string>
   <!-- The hint for the enter new pin step in change voicemail PIN activity -->
-  <string translatable="false" name="change_pin_enter_new_pin_hint">PIN must be <xliff:g id="min" example="4">%1$d</xliff:g>-<xliff:g id="max" example="7">%2$d</xliff:g> digits.</string>
+  <string name="change_pin_enter_new_pin_hint">PIN must be <xliff:g example="4" id="min">%1$d</xliff:g>-<xliff:g example="7" id="max">%2$d</xliff:g> digits.</string>
   <!-- The title for the confirm new pin step in change voicemail PIN activity -->
-  <string translatable="false" name="change_pin_confirm_pin_header">Confirm your PIN</string>
+  <string name="change_pin_confirm_pin_header">Confirm your PIN</string>
   <!-- The error message for th confirm new pin step in change voicemail PIN activity, if the pin doen't match the one previously entered -->
-  <string translatable="false" name="change_pin_confirm_pins_dont_match">PINs don\'t match</string>
+  <string name="change_pin_confirm_pins_dont_match">PINs don\'t match</string>
   <!-- The toast to show after the voicemail PIN has been successfully changed -->
-  <string translatable="false" name="change_pin_succeeded">Voicemail PIN updated</string>
+  <string name="change_pin_succeeded">Voicemail PIN updated</string>
   <!-- The error message to show if the server reported an error while attempting to change the voicemail PIN -->
-  <string translatable="false" name="change_pin_system_error">Unable to set PIN</string>
+  <string name="change_pin_system_error">Unable to set PIN</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java
index 8041e5b75..2fc08f0ae 100644
--- a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java
+++ b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java
@@ -122,9 +122,6 @@ public class VoicemailSettingsFragment extends PreferenceFragment
     autoArchiveSwitchPreference =
         (SwitchPreference)
             findPreference(getString(R.string.voicemail_visual_voicemail_archive_key));
-    autoArchiveSwitchPreference.setOnPreferenceChangeListener(this);
-    autoArchiveSwitchPreference.setChecked(
-        VisualVoicemailSettingsUtil.isArchiveEnabled(getContext(), phoneAccountHandle));
 
     if (!ConfigProviderBindings.get(getContext())
         .getBoolean(VisualVoicemailSettingsUtil.ALLOW_VOICEMAIL_ARCHIVE, true)) {
@@ -156,11 +153,19 @@ public class VoicemailSettingsFragment extends PreferenceFragment
       voicemailVisualVoicemail.setOnPreferenceChangeListener(this);
       voicemailVisualVoicemail.setChecked(
           VisualVoicemailSettingsUtil.isEnabled(getContext(), phoneAccountHandle));
+
+      autoArchiveSwitchPreference.setOnPreferenceChangeListener(this);
+      autoArchiveSwitchPreference.setSummary(
+          getText(R.string.voicemail_visual_voicemail_auto_archive_temporary_disclaimer));
+      autoArchiveSwitchPreference.setChecked(
+          VisualVoicemailSettingsUtil.isArchiveEnabled(getContext(), phoneAccountHandle));
+
       if (!isVisualVoicemailActivated()) {
         prefSet.removePreference(voicemailChangePinPreference);
       }
     } else {
       prefSet.removePreference(voicemailVisualVoicemail);
+      prefSet.removePreference(autoArchiveSwitchPreference);
       prefSet.removePreference(voicemailChangePinPreference);
     }
 
diff --git a/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java b/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java
index ef0bf10e9..43e2b85bd 100644
--- a/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java
+++ b/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java
@@ -28,7 +28,7 @@ import android.telecom.PhoneAccountHandle;
 import android.telephony.VisualVoicemailSms;
 import com.android.voicemail.impl.ActivationTask;
 import com.android.voicemail.impl.OmtpConstants;
-import com.android.voicemail.impl.OmtpService;
+import com.android.voicemail.impl.OmtpReceiver;
 import com.android.voicemail.impl.OmtpVvmCarrierConfigHelper;
 import com.android.voicemail.impl.Voicemail;
 import com.android.voicemail.impl.Voicemail.Builder;
@@ -52,7 +52,7 @@ public class OmtpMessageReceiver extends BroadcastReceiver {
   @Override
   public void onReceive(Context context, Intent intent) {
     mContext = context;
-    VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpService.EXTRA_VOICEMAIL_SMS);
+    VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpReceiver.EXTRA_VOICEMAIL_SMS);
     PhoneAccountHandle phone = sms.getPhoneAccountHandle();
 
     if (phone == null) {
diff --git a/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java b/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java
index d178628c6..dd9204d3e 100644
--- a/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java
+++ b/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java
@@ -33,7 +33,7 @@ import android.telephony.SmsManager;
 import android.telephony.VisualVoicemailSms;
 import com.android.voicemail.impl.Assert;
 import com.android.voicemail.impl.OmtpConstants;
-import com.android.voicemail.impl.OmtpService;
+import com.android.voicemail.impl.OmtpReceiver;
 import com.android.voicemail.impl.OmtpVvmCarrierConfigHelper;
 import com.android.voicemail.impl.VvmLog;
 import com.android.voicemail.impl.protocol.VisualVoicemailProtocol;
@@ -67,7 +67,7 @@ public class StatusSmsFetcher extends BroadcastReceiver implements Closeable {
     mContext = context;
     mPhoneAccountHandle = phoneAccountHandle;
     IntentFilter filter = new IntentFilter(ACTION_REQUEST_SENT_INTENT);
-    filter.addAction(OmtpService.ACTION_SMS_RECEIVED);
+    filter.addAction(OmtpReceiver.ACTION_SMS_RECEIVED);
     context.registerReceiver(this, filter);
   }
 
@@ -110,7 +110,7 @@ public class StatusSmsFetcher extends BroadcastReceiver implements Closeable {
       return;
     }
 
-    VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpService.EXTRA_VOICEMAIL_SMS);
+    VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpReceiver.EXTRA_VOICEMAIL_SMS);
 
     if (!mPhoneAccountHandle.equals(sms.getPhoneAccountHandle())) {
       return;
diff --git a/java/com/android/voicemail/stub/StubVoicemailClient.java b/java/com/android/voicemail/stub/StubVoicemailClient.java
index 9481a0e1a..6639292c1 100644
--- a/java/com/android/voicemail/stub/StubVoicemailClient.java
+++ b/java/com/android/voicemail/stub/StubVoicemailClient.java
@@ -34,6 +34,10 @@ public final class StubVoicemailClient implements VoicemailClient {
       Context context, StringBuilder where, List<String> selectionArgs) {}
 
   @Override
+  public void appendOmtpVoicemailStatusSelectionClause(
+      Context context, StringBuilder where, List<String> selectionArgs) {}
+
+  @Override
   public String getSettingsFragment() {
     return null;
   }
author	Eric Erfanian <erfanian@google.com>	2017-03-21 10:11:17 -0700
committer	Eric Erfanian <erfanian@google.com>	2017-03-21 10:11:17 -0700
commit	fc37b02f5d3381a7882770941e461b13b679b6ef (patch)
tree	23ce96100a89f1cf8847a4967efd35e56b6f8092
parent	30ccc4f3aa6da94f0bb8a01a880a6353b883b263 (diff)