Revert "Update AOSP Dialer source from internal google3 repository at cl/150622237" This reverts commit 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd. Change-Id: Ida8c5ee67669524dc63b9adc60a6dd392cb9b9a6

commit: 30ccc4f3aa6da94f0bb8a01a880a6353b883b263 [log] [tgz]
author: Eric Erfanian <erfanian@google.com> Mon Mar 20 20:40:36 2017 +0000
committer: Eric Erfanian <erfanian@google.com> Mon Mar 20 20:40:36 2017 +0000
tree: 2f55365aaf87df9ba7c1fe0be56a7d0988eadf30
parent: 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd [diff]
diff --git a/java/com/android/voicemail/VisualVoicemailTypeExtensions.java b/java/com/android/voicemail/VisualVoicemailTypeExtensions.java
deleted file mode 100644
index 0564810..0000000
--- a/java/com/android/voicemail/VisualVoicemailTypeExtensions.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.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 54cffda..b237f65 100644
--- a/java/com/android/voicemail/VoicemailClient.java
+++ b/java/com/android/voicemail/VoicemailClient.java

@@ -45,18 +45,6 @@
    */
   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 bed75f0..6dd6f9d 100644
--- a/java/com/android/voicemail/VoicemailComponent.java
+++ b/java/com/android/voicemail/VoicemailComponent.java

@@ -17,18 +17,26 @@
 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. */
-@Subcomponent
-public abstract class VoicemailComponent {
+public class VoicemailComponent {
+    private static VoicemailComponent instance;
+    private VoicemailClientImpl voicemailClient;
 
-  public abstract VoicemailClient getVoicemailClient();
+  public VoicemailClient getVoicemailClient() {
+    if (voicemailClient == null) {
+        voicemailClient = new VoicemailClientImpl();
+    }
+    return voicemailClient;
+  }
 
   public static VoicemailComponent get(Context context) {
-    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
-        .voicemailComponent();
+    if (instance == null) {
+        instance = new VoicemailComponent();
+    }
+    return instance;
   }
 
   /** 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 8c0bd35..0d90d59 100644
--- a/java/com/android/voicemail/impl/AndroidManifest.xml
+++ b/java/com/android/voicemail/impl/AndroidManifest.xml

@@ -85,12 +85,14 @@
       android:name="com.android.voicemail.impl.scheduling.TaskSchedulerService"
       android:exported="false"/>
 
-    <receiver android:name="com.android.voicemail.impl.OmtpReceiver"
+    <service
+      android:name="com.android.voicemail.impl.OmtpService"
+      android:permission="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"
       android:exported="true">
       <intent-filter>
-        <action android:name="com.android.phone.vvm.ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT" />
+        <action android:name="android.telephony.VisualVoicemailService"/>
       </intent-filter>
-    </receiver>
+    </service>
 
     <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
deleted file mode 100644
index 0b871c4..0000000
--- a/java/com/android/voicemail/impl/OmtpReceiver.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.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
new file mode 100644
index 0000000..8b69731
--- /dev/null
+++ b/java/com/android/voicemail/impl/OmtpService.java

@@ -0,0 +1,69 @@
+/*
+ * 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 91af189..1ad12ae 100644
--- a/java/com/android/voicemail/impl/VoicemailClientImpl.java
+++ b/java/com/android/voicemail/impl/VoicemailClientImpl.java

@@ -16,14 +16,12 @@
 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;
@@ -44,12 +42,6 @@
    */
   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());
@@ -78,73 +70,21 @@
       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(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(")");
-    }
+    where.append(
+        "AND ("
+            + "("
+            + Voicemails.IS_OMTP_VOICEMAIL
+            + " != 1)"
+            + "OR "
+            + "("
+            + Voicemails.SOURCE_PACKAGE
+            + " = ? )"
+            + ")");
+    selectionArgs.add(omtpSource);
 
     for (String blacklistedPackage : OMTP_VOICEMAIL_BLACKLIST) {
-      where.append("AND (").append(Voicemails.SOURCE_PACKAGE).append("!= ?)");
+      where.append("AND (" + Voicemails.SOURCE_PACKAGE + "!= ?)");
       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 ef27c22..056fb2e 100644
--- a/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java
+++ b/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java

@@ -19,13 +19,14 @@
 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) {
@@ -36,7 +37,7 @@
         return new OmtpProtocol();
       case TelephonyManager.VVM_TYPE_CVVM:
         return new CvvmProtocol();
-      case VisualVoicemailTypeExtensions.VVM_TYPE_VVM3:
+      case 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 d71e534..f369727 100644
--- a/java/com/android/voicemail/impl/res/values-af/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-af/strings.xml

@@ -16,66 +16,8 @@
 
 <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 8376fa1..5c371a9 100644
--- a/java/com/android/voicemail/impl/res/values-am/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-am/strings.xml

@@ -16,66 +16,8 @@
 
 <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 e71245b..c6d5ab8 100644
--- a/java/com/android/voicemail/impl/res/values-ar/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ar/strings.xml

@@ -16,66 +16,8 @@
 
 <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 e6439d4..6376f06 100644
--- a/java/com/android/voicemail/impl/res/values-az/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-az/strings.xml

@@ -16,66 +16,8 @@
 
 <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 af715c8..fdbd93a 100644
--- a/java/com/android/voicemail/impl/res/values-be/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-be/strings.xml

@@ -16,66 +16,8 @@
 
 <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 3f56075..f9871b4 100644
--- a/java/com/android/voicemail/impl/res/values-bg/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bg/strings.xml

@@ -16,66 +16,8 @@
 
 <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 5907b59..99b2ec7 100644
--- a/java/com/android/voicemail/impl/res/values-bn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bn/strings.xml

@@ -16,66 +16,8 @@
 
 <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 f8c09dd..2e91028 100644
--- a/java/com/android/voicemail/impl/res/values-bs/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bs/strings.xml

@@ -16,66 +16,8 @@
 
 <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 dab8465..62b27a4 100644
--- a/java/com/android/voicemail/impl/res/values-ca/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ca/strings.xml

@@ -16,66 +16,8 @@
 
 <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 b949266..91bbbac 100644
--- a/java/com/android/voicemail/impl/res/values-cs/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-cs/strings.xml

@@ -16,66 +16,8 @@
 
 <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 36a5a24..4eb4c96 100644
--- a/java/com/android/voicemail/impl/res/values-da/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-da/strings.xml

@@ -16,66 +16,8 @@
 
 <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 5456822..9f49154 100644
--- a/java/com/android/voicemail/impl/res/values-de/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-de/strings.xml

@@ -16,66 +16,8 @@
 
 <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 d0049e2..4d4b294 100644
--- a/java/com/android/voicemail/impl/res/values-el/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-el/strings.xml

@@ -16,66 +16,8 @@
 
 <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 ad30b2c..37e5365 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,66 +16,8 @@
 
 <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 ad30b2c..37e5365 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,66 +16,8 @@
 
 <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 ad30b2c..37e5365 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,66 +16,8 @@
 
 <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 037fb1b..1b60688 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,66 +16,8 @@
 
 <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 7183201..970eea8 100644
--- a/java/com/android/voicemail/impl/res/values-es/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-es/strings.xml

@@ -16,66 +16,8 @@
 
 <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 90ad8f0..21f6f03 100644
--- a/java/com/android/voicemail/impl/res/values-et/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-et/strings.xml

@@ -16,66 +16,8 @@
 
 <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 719cd19..a3a7ad8 100644
--- a/java/com/android/voicemail/impl/res/values-eu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-eu/strings.xml

@@ -16,66 +16,8 @@
 
 <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 f997f12..ff1febc 100644
--- a/java/com/android/voicemail/impl/res/values-fa/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fa/strings.xml

@@ -16,66 +16,8 @@
 
 <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 58a162c..7a452bc 100644
--- a/java/com/android/voicemail/impl/res/values-fi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fi/strings.xml

@@ -16,66 +16,8 @@
 
 <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 dcd96af..58afe57 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,66 +16,8 @@
 
 <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 8e7162e..ed40a8a 100644
--- a/java/com/android/voicemail/impl/res/values-fr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fr/strings.xml

@@ -16,66 +16,8 @@
 
 <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 25833bc..206acfc 100644
--- a/java/com/android/voicemail/impl/res/values-gl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-gl/strings.xml

@@ -16,66 +16,8 @@
 
 <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 5ccc48f..114f016 100644
--- a/java/com/android/voicemail/impl/res/values-gu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-gu/strings.xml

@@ -16,66 +16,8 @@
 
 <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 58f793e..08a1ed8 100644
--- a/java/com/android/voicemail/impl/res/values-hi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hi/strings.xml

@@ -16,66 +16,8 @@
 
 <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 53c4969..71c7511 100644
--- a/java/com/android/voicemail/impl/res/values-hr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hr/strings.xml

@@ -16,66 +16,8 @@
 
 <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 ce9376a..f7e670c 100644
--- a/java/com/android/voicemail/impl/res/values-hu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hu/strings.xml

@@ -16,66 +16,8 @@
 
 <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 89b72ee..a5dab45 100644
--- a/java/com/android/voicemail/impl/res/values-hy/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hy/strings.xml

@@ -16,66 +16,8 @@
 
 <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 318ae52..48b31bb 100644
--- a/java/com/android/voicemail/impl/res/values-in/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-in/strings.xml

@@ -16,66 +16,8 @@
 
 <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 360058c..aa4622d 100644
--- a/java/com/android/voicemail/impl/res/values-is/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-is/strings.xml

@@ -16,66 +16,8 @@
 
 <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 67cf21a..13f69c5 100644
--- a/java/com/android/voicemail/impl/res/values-it/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-it/strings.xml

@@ -16,66 +16,8 @@
 
 <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 4593455..874b5ab 100644
--- a/java/com/android/voicemail/impl/res/values-iw/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-iw/strings.xml

@@ -16,66 +16,8 @@
 
 <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 1033630..04c4675 100644
--- a/java/com/android/voicemail/impl/res/values-ja/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ja/strings.xml

@@ -16,66 +16,8 @@
 
 <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 16677fa..68b51a3 100644
--- a/java/com/android/voicemail/impl/res/values-ka/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ka/strings.xml

@@ -16,66 +16,8 @@
 
 <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 3e65922..8f1ac97 100644
--- a/java/com/android/voicemail/impl/res/values-kk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-kk/strings.xml

@@ -16,66 +16,8 @@
 
 <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 72a6f04..6ddf1a7 100644
--- a/java/com/android/voicemail/impl/res/values-km/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-km/strings.xml

@@ -16,66 +16,8 @@
 
 <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 66336cd..2cb811d 100644
--- a/java/com/android/voicemail/impl/res/values-kn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-kn/strings.xml

@@ -16,66 +16,8 @@
 
 <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 c9e2784..729ef91 100644
--- a/java/com/android/voicemail/impl/res/values-ko/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ko/strings.xml

@@ -16,66 +16,8 @@
 
 <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 35e70b0..922fbf6 100644
--- a/java/com/android/voicemail/impl/res/values-ky/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ky/strings.xml

@@ -16,66 +16,8 @@
 
 <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 84abbe1..b92d8d6 100644
--- a/java/com/android/voicemail/impl/res/values-lo/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lo/strings.xml

@@ -16,66 +16,8 @@
 
 <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 ae3cd4c..6d298d3 100644
--- a/java/com/android/voicemail/impl/res/values-lt/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lt/strings.xml

@@ -16,66 +16,8 @@
 
 <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 c961ba8..4cde6a8 100644
--- a/java/com/android/voicemail/impl/res/values-lv/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lv/strings.xml

@@ -16,66 +16,8 @@
 
 <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 6f2188a..fb4a465 100644
--- a/java/com/android/voicemail/impl/res/values-mk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mk/strings.xml

@@ -16,66 +16,8 @@
 
 <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 0e91221..9aff231 100644
--- a/java/com/android/voicemail/impl/res/values-ml/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ml/strings.xml

@@ -16,66 +16,8 @@
 
 <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 aa9cbed..68dc5be 100644
--- a/java/com/android/voicemail/impl/res/values-mn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mn/strings.xml

@@ -16,66 +16,8 @@
 
 <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 1c13e9d..f060728 100644
--- a/java/com/android/voicemail/impl/res/values-mr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mr/strings.xml

@@ -16,66 +16,8 @@
 
 <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 12724d4..c84d99d 100644
--- a/java/com/android/voicemail/impl/res/values-ms/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ms/strings.xml

@@ -16,66 +16,8 @@
 
 <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 a7b96ad..010c421 100644
--- a/java/com/android/voicemail/impl/res/values-my/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-my/strings.xml

@@ -16,66 +16,8 @@
 
 <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 2398de1..ccebb93 100644
--- a/java/com/android/voicemail/impl/res/values-nb/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-nb/strings.xml

@@ -16,66 +16,8 @@
 
 <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 ecf5a46..1165a52 100644
--- a/java/com/android/voicemail/impl/res/values-ne/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ne/strings.xml

@@ -16,66 +16,8 @@
 
 <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 5078c0a..058ef4b 100644
--- a/java/com/android/voicemail/impl/res/values-nl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-nl/strings.xml

@@ -16,66 +16,8 @@
 
 <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 2398de1..ccebb93 100644
--- a/java/com/android/voicemail/impl/res/values-no/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-no/strings.xml

@@ -16,66 +16,8 @@
 
 <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 a754ce2..9e1000f 100644
--- a/java/com/android/voicemail/impl/res/values-pa/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pa/strings.xml

@@ -16,66 +16,8 @@
 
 <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 3453ede..762bd69 100644
--- a/java/com/android/voicemail/impl/res/values-pl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pl/strings.xml

@@ -16,66 +16,8 @@
 
 <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 4d7691b..673f5f0 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,66 +16,8 @@
 
 <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 18848e1..604449c 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,66 +16,8 @@
 
 <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 4d7691b..673f5f0 100644
--- a/java/com/android/voicemail/impl/res/values-pt/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pt/strings.xml

@@ -16,66 +16,8 @@
 
 <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 d3a5cd7..2c96319 100644
--- a/java/com/android/voicemail/impl/res/values-ro/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ro/strings.xml

@@ -16,66 +16,8 @@
 
 <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 7a9692e..7d6682d 100644
--- a/java/com/android/voicemail/impl/res/values-ru/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ru/strings.xml

@@ -16,66 +16,8 @@
 
 <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 9351ddc..841344f 100644
--- a/java/com/android/voicemail/impl/res/values-si/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-si/strings.xml

@@ -16,66 +16,8 @@
 
 <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 afc6251..e0caaa5 100644
--- a/java/com/android/voicemail/impl/res/values-sk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sk/strings.xml

@@ -16,66 +16,8 @@
 
 <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 3fef506..e8b0ed4 100644
--- a/java/com/android/voicemail/impl/res/values-sl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sl/strings.xml

@@ -16,66 +16,8 @@
 
 <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 de72b01..6008696 100644
--- a/java/com/android/voicemail/impl/res/values-sq/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sq/strings.xml

@@ -16,66 +16,8 @@
 
 <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 27fc4dd..1fcb4d3 100644
--- a/java/com/android/voicemail/impl/res/values-sr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sr/strings.xml

@@ -16,66 +16,8 @@
 
 <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 196e9ff..75bf003 100644
--- a/java/com/android/voicemail/impl/res/values-sv/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sv/strings.xml

@@ -16,66 +16,8 @@
 
 <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 6c16d66..70c5bd1 100644
--- a/java/com/android/voicemail/impl/res/values-sw/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sw/strings.xml

@@ -16,66 +16,8 @@
 
 <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 353818a..55ca943 100644
--- a/java/com/android/voicemail/impl/res/values-ta/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ta/strings.xml

@@ -16,66 +16,8 @@
 
 <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 0b70bc1..6ede489 100644
--- a/java/com/android/voicemail/impl/res/values-te/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-te/strings.xml

@@ -16,66 +16,8 @@
 
 <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 8700774..d42a1fa 100644
--- a/java/com/android/voicemail/impl/res/values-th/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-th/strings.xml

@@ -16,66 +16,8 @@
 
 <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 9d42fb0..20c7883 100644
--- a/java/com/android/voicemail/impl/res/values-tl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-tl/strings.xml

@@ -16,66 +16,8 @@
 
 <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 05d5b5f..9826da9 100644
--- a/java/com/android/voicemail/impl/res/values-tr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-tr/strings.xml

@@ -16,66 +16,8 @@
 
 <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 d16e82f..a834b1a 100644
--- a/java/com/android/voicemail/impl/res/values-uk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-uk/strings.xml

@@ -16,66 +16,8 @@
 
 <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 625b0e4..172b9a0 100644
--- a/java/com/android/voicemail/impl/res/values-ur/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ur/strings.xml

@@ -16,66 +16,8 @@
 
 <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 9d33bff..3eff815 100644
--- a/java/com/android/voicemail/impl/res/values-uz/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-uz/strings.xml

@@ -16,66 +16,8 @@
 
 <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 76aac53..70c00ad 100644
--- a/java/com/android/voicemail/impl/res/values-vi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-vi/strings.xml

@@ -16,66 +16,8 @@
 
 <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 5a02f01..5a97d46 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,66 +16,8 @@
 
 <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 59feff7..6ea784a 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,66 +16,8 @@
 
 <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 59feff7..6ea784a 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,66 +16,8 @@
 
 <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 222b203..2138b67 100644
--- a/java/com/android/voicemail/impl/res/values-zu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zu/strings.xml

@@ -16,66 +16,8 @@
 
 <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 f18213b..6c3d552 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 name="voicemail_settings_with_label">Voicemail (<xliff:g example="Mock Carrier" id="subscriptionlabel">%s</xliff:g>)</string>
+  <string translatable="false" name="voicemail_settings_with_label">Voicemail (<xliff:g id="subscriptionlabel" example="Mock Carrier">%s</xliff:g>)</string>
 
   <!-- Call settings screen, setting option name -->
-  <string name="voicemail_settings_title">Voicemail</string>
+  <string translatable="false" name="voicemail_settings_title">Voicemail</string>
 
   <!-- DO NOT TRANSLATE. Internal key for a voicemail notification preference. -->
-  <string name="voicemail_notification_ringtone_key" translatable="false">voicemail_notification_ringtone_key</string>
+  <string translatable="false" name="voicemail_notification_ringtone_key">voicemail_notification_ringtone_key</string>
   <!-- DO NOT TRANSLATE. Internal key for a voicemail notification preference. -->
-  <string name="voicemail_notification_vibrate_key" translatable="false">voicemail_notification_vibrate_key</string>
+  <string translatable="false" name="voicemail_notification_vibrate_key">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,84 +36,79 @@
          which sound to play when a voicemail notification is received.
          [CHAR LIMIT=30] -->
   <string name="voicemail_notification_ringtone_title">Sound</string>
-  <string name="voicemail_advanced_settings_key" translatable="false">voicemail_advanced_settings_key</string>
+  <string translatable="false" name="voicemail_advanced_settings_key">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 name="voicemail_visual_voicemail_key" translatable="false">
+    <string translatable="false" name="voicemail_visual_voicemail_key">
         voicemail_visual_voicemail_key
     </string>
   <!-- DO NOT TRANSLATE. Internal key for a visual voicemail archive preference. -->
-    <string name="voicemail_visual_voicemail_archive_key" translatable="false">
+    <string translatable="false" name="voicemail_visual_voicemail_archive_key">
         archive_is_enabled
     </string>
   <!-- DO NOT TRANSLATE. Internal key for a voicemail change pin preference. -->
-  <string name="voicemail_change_pin_key" translatable="false">voicemail_change_pin_key</string>
+  <string translatable="false" name="voicemail_change_pin_key">voicemail_change_pin_key</string>
 
   <!-- Visual voicemail on/off title [CHAR LIMIT=40] -->
-  <string name="voicemail_visual_voicemail_switch_title">Visual Voicemail</string>
+  <string translatable="false" name="voicemail_visual_voicemail_switch_title">Visual Voicemail</string>
 
   <!-- Visual voicemail archive on/off title [CHAR LIMIT=40] -->
-  <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 translatable="false" name="voicemail_visual_voicemail_auto_archive_switch_title">
+    Voicemail Auto Archive
   </string>
 
-
   <!-- Voicemail change PIN dialog title [CHAR LIMIT=40] -->
-  <string name="voicemail_set_pin_dialog_title">Set PIN</string>
+  <string translatable="false" name="voicemail_set_pin_dialog_title">Set PIN</string>
   <!-- Voicemail change PIN dialog title [CHAR LIMIT=40] -->
-  <string name="voicemail_change_pin_dialog_title">Change PIN</string>
+  <string translatable="false" name="voicemail_change_pin_dialog_title">Change PIN</string>
 
   <!-- Hint for the old PIN field in the change vociemail PIN dialog -->
-  <string name="vm_change_pin_old_pin">Old PIN</string>
+  <string translatable="false" name="vm_change_pin_old_pin">Old PIN</string>
   <!-- Hint for the new PIN field in the change vociemail PIN dialog -->
-  <string name="vm_change_pin_new_pin">New PIN</string>
+  <string translatable="false" name="vm_change_pin_new_pin">New PIN</string>
 
   <!-- Message on the dialog when PIN changing is in progress -->
-  <string name="vm_change_pin_progress_message">Please wait.</string>
+  <string translatable="false" name="vm_change_pin_progress_message">Please wait.</string>
   <!-- Error message for the voicemail PIN change if the PIN is too short -->
-  <string name="vm_change_pin_error_too_short">The new PIN is too short.</string>
+  <string translatable="false" 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 name="vm_change_pin_error_too_long">The new PIN is too long.</string>
+  <string translatable="false" 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 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 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>
   <!-- Error message for the voicemail PIN change if the old PIN entered doesn't match  -->
-  <string name="vm_change_pin_error_mismatch">The old PIN does not match.</string>
+  <string translatable="false" 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 name="vm_change_pin_error_invalid">The new PIN contains invalid characters.</string>
+  <string translatable="false" 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 name="vm_change_pin_error_system_error">Unable to change PIN</string>
+  <string translatable="false" 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 name="vvm_unsupported_message_format">Unsupported message type, call <xliff:g example="*86" id="number">%s</xliff:g> to listen.</string>
+  <string translatable="false" name="vvm_unsupported_message_format">Unsupported message type, call <xliff:g id="number" example="*86">%s</xliff:g> to listen.</string>
 
   <!-- The title for the change voicemail PIN activity -->
-  <string name="change_pin_title">Change Voicemail PIN</string>
+  <string translatable="false" name="change_pin_title">Change Voicemail PIN</string>
   <!-- The label for the continue button in change voicemail PIN activity -->
-  <string name="change_pin_continue_label">Continue</string>
+  <string translatable="false" name="change_pin_continue_label">Continue</string>
   <!-- The label for the cancel button in change voicemail PIN activity -->
-  <string name="change_pin_cancel_label">Cancel</string>
+  <string translatable="false" name="change_pin_cancel_label">Cancel</string>
   <!-- The label for the ok button in change voicemail PIN activity -->
-  <string name="change_pin_ok_label">Ok</string>
+  <string translatable="false" name="change_pin_ok_label">Ok</string>
   <!-- The title for the enter old pin step in change voicemail PIN activity -->
-  <string name="change_pin_enter_old_pin_header">Confirm your old PIN</string>
+  <string translatable="false" 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 name="change_pin_enter_old_pin_hint">Enter your voicemail PIN to continue.</string>
+  <string translatable="false" 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 name="change_pin_enter_new_pin_header">Set a new PIN</string>
+  <string translatable="false" 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 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>
+  <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>
   <!-- The title for the confirm new pin step in change voicemail PIN activity -->
-  <string name="change_pin_confirm_pin_header">Confirm your PIN</string>
+  <string translatable="false" 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 name="change_pin_confirm_pins_dont_match">PINs don\'t match</string>
+  <string translatable="false" 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 name="change_pin_succeeded">Voicemail PIN updated</string>
+  <string translatable="false" 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 name="change_pin_system_error">Unable to set PIN</string>
+  <string translatable="false" 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 2fc08f0..8041e5b 100644
--- a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java
+++ b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java

@@ -122,6 +122,9 @@
     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)) {
@@ -153,19 +156,11 @@
       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 43e2b85..ef0bf10 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.telephony.VisualVoicemailSms;
 import com.android.voicemail.impl.ActivationTask;
 import com.android.voicemail.impl.OmtpConstants;
-import com.android.voicemail.impl.OmtpReceiver;
+import com.android.voicemail.impl.OmtpService;
 import com.android.voicemail.impl.OmtpVvmCarrierConfigHelper;
 import com.android.voicemail.impl.Voicemail;
 import com.android.voicemail.impl.Voicemail.Builder;
@@ -52,7 +52,7 @@
   @Override
   public void onReceive(Context context, Intent intent) {
     mContext = context;
-    VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpReceiver.EXTRA_VOICEMAIL_SMS);
+    VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpService.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 dd9204d..d178628 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.VisualVoicemailSms;
 import com.android.voicemail.impl.Assert;
 import com.android.voicemail.impl.OmtpConstants;
-import com.android.voicemail.impl.OmtpReceiver;
+import com.android.voicemail.impl.OmtpService;
 import com.android.voicemail.impl.OmtpVvmCarrierConfigHelper;
 import com.android.voicemail.impl.VvmLog;
 import com.android.voicemail.impl.protocol.VisualVoicemailProtocol;
@@ -67,7 +67,7 @@
     mContext = context;
     mPhoneAccountHandle = phoneAccountHandle;
     IntentFilter filter = new IntentFilter(ACTION_REQUEST_SENT_INTENT);
-    filter.addAction(OmtpReceiver.ACTION_SMS_RECEIVED);
+    filter.addAction(OmtpService.ACTION_SMS_RECEIVED);
     context.registerReceiver(this, filter);
   }
 
@@ -110,7 +110,7 @@
       return;
     }
 
-    VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpReceiver.EXTRA_VOICEMAIL_SMS);
+    VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpService.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 6639292..9481a0e 100644
--- a/java/com/android/voicemail/stub/StubVoicemailClient.java
+++ b/java/com/android/voicemail/stub/StubVoicemailClient.java

@@ -34,10 +34,6 @@
       Context context, StringBuilder where, List<String> selectionArgs) {}
 
   @Override
-  public void appendOmtpVoicemailStatusSelectionClause(
-      Context context, StringBuilder where, List<String> selectionArgs) {}
-
-  @Override
   public String getSettingsFragment() {
     return null;
   }
commit	30ccc4f3aa6da94f0bb8a01a880a6353b883b263	[log] [tgz]
author	Eric Erfanian <erfanian@google.com>	Mon Mar 20 20:40:36 2017 +0000
committer	Eric Erfanian <erfanian@google.com>	Mon Mar 20 20:40:36 2017 +0000
tree	2f55365aaf87df9ba7c1fe0be56a7d0988eadf30
parent	06b6b56e9eaa91ebf757ea641e38a9c885fa40bd [diff]